update to 1.31
This commit is contained in:
form
parent
8c7afd1827
commit
ba7ace727d
@ -3,10 +3,10 @@
|
||||
# Date created: 21 Apr 1998
|
||||
# Whom: form@vs.itam.nsc.ru
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 1998/04/26 04:48:27 marc Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 1998/06/30 05:54:49 form Exp $
|
||||
#
|
||||
|
||||
DISTNAME= cucipop-1.21
|
||||
DISTNAME= cucipop-1.31
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (cucipop-1.21.tar.gz) = aed88f17ec45db1570970b48777f29b3
|
||||
MD5 (cucipop-1.31.tar.gz) = e4dc7c3c6e3a4a83dde5cbbe21fee5f8
|
||||
|
||||
@ -1,51 +1,98 @@
|
||||
--- Makefile.orig Thu Jul 31 18:00:30 1997
|
||||
+++ Makefile Mon Apr 27 14:48:12 1998
|
||||
@@ -1,30 +1,29 @@
|
||||
#$Id: patch-aa,v 1.2 1998/04/28 17:23:10 marc Exp $
|
||||
|
||||
-BASENAME= /usr
|
||||
+BASENAME= $(PREFIX)
|
||||
|
||||
GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
|
||||
-Wpointer-arith -Wconversion -Waggregate-return \
|
||||
#-Wimplicit -Wshadow #-Wuninitialized
|
||||
|
||||
-CFLAGS = -O #$(GCC_WARNINGS)
|
||||
-LDFLAGS =
|
||||
+CFLAGS = -O -DMAILSPOOLDIR=\"/var/mail/\" #$(GCC_WARNINGS)
|
||||
+LDFLAGS +=
|
||||
|
||||
O=o
|
||||
|
||||
-BINDIR=$(BASENAME)/sbin
|
||||
+BINDIR=$(BASENAME)/libexec
|
||||
MANDIR=$(BASENAME)/man/man8
|
||||
|
||||
-INSTALL=install -o root -m
|
||||
-BINPERM=02755 -s -g mail
|
||||
-REGPERM=0644
|
||||
+INSTALL=install -o bin -m
|
||||
+BINPERM=0555 -s -g bin
|
||||
+REGPERM=0444 -g bin
|
||||
|
||||
#
|
||||
# When compiling without APOP support, the md5 library can be omitted.
|
||||
|
||||
MD5_OBJ=md5/md5c.$(O)
|
||||
|
||||
-OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
|
||||
- $(MD5_OBJ)
|
||||
+OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O)
|
||||
|
||||
all: cucipop
|
||||
|
||||
@@ -44,7 +43,8 @@
|
||||
|
||||
install: cucipop cucipop.8
|
||||
$(INSTALL) $(BINPERM) cucipop $(BINDIR)
|
||||
- $(INSTALL) $(REGPERM) cucipop.8 $(MANDIR)
|
||||
+ sed -e 's,!!PREFIX!!,$(PREFIX),g' cucipop.8 > cucipop.8-out
|
||||
+ $(INSTALL) $(REGPERM) cucipop.8-out $(MANDIR)/cucipop.8
|
||||
ls -l $(BINDIR)/cucipop $(MANDIR)/cucipop.8
|
||||
|
||||
deinstall:
|
||||
*** Makefile.orig Wed May 13 04:09:14 1998
|
||||
--- Makefile Tue Jun 30 12:44:07 1998
|
||||
***************
|
||||
*** 1,6 ****
|
||||
#$Id: patch-aa,v 1.3 1998/06/30 05:54:52 form Exp $
|
||||
|
||||
! BASENAME= /usr
|
||||
|
||||
GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
|
||||
-Wpointer-arith -Wconversion -Waggregate-return \
|
||||
--- 1,6 ----
|
||||
#$Id: patch-aa,v 1.3 1998/06/30 05:54:52 form Exp $
|
||||
|
||||
! BASENAME= $(PREFIX)
|
||||
|
||||
GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
|
||||
-Wpointer-arith -Wconversion -Waggregate-return \
|
||||
***************
|
||||
*** 10,30 ****
|
||||
# Omit USE_DB if you don't have the -ldb2 library (Berkeley DB, v2.x)
|
||||
# WARNING: bulletins are not remembered to have been deleted without USE_DB
|
||||
|
||||
! CFLAGS = -O -DUSE_DB #$(GCC_WARNINGS)
|
||||
! LDFLAGS = -lcrypt -ldb2
|
||||
|
||||
# If you change this, edit config.h as well
|
||||
! CUCIPOPLIB=/var/lib/cucipop
|
||||
CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
|
||||
|
||||
O=o
|
||||
|
||||
! BINDIR=$(BASENAME)/sbin
|
||||
MANDIR=$(BASENAME)/man/man8
|
||||
|
||||
INSTALL=install -o root -m
|
||||
! BINPERM=02755 -s -g mail
|
||||
! REGPERM=0644
|
||||
|
||||
#
|
||||
# When compiling without APOP support, the md5 library can be omitted.
|
||||
--- 10,30 ----
|
||||
# Omit USE_DB if you don't have the -ldb2 library (Berkeley DB, v2.x)
|
||||
# WARNING: bulletins are not remembered to have been deleted without USE_DB
|
||||
|
||||
! CFLAGS = -O #-DUSE_DB #$(GCC_WARNINGS)
|
||||
! LDFLAGS =
|
||||
|
||||
# If you change this, edit config.h as well
|
||||
! CUCIPOPLIB=/var/spool/cucipop
|
||||
CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
|
||||
|
||||
O=o
|
||||
|
||||
! BINDIR=$(BASENAME)/libexec
|
||||
MANDIR=$(BASENAME)/man/man8
|
||||
|
||||
INSTALL=install -o root -m
|
||||
! BINPERM=755 -s -g bin
|
||||
! REGPERM=444
|
||||
|
||||
#
|
||||
# When compiling without APOP support, the md5 library can be omitted.
|
||||
***************
|
||||
*** 32,38 ****
|
||||
MD5_OBJ=md5/md5c.$(O)
|
||||
|
||||
OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
|
||||
! dbops.$(O) hsort.$(O) simplecrypt.$(O) $(MD5_OBJ)
|
||||
|
||||
BINS=cucipop makevpopdb
|
||||
|
||||
--- 32,38 ----
|
||||
MD5_OBJ=md5/md5c.$(O)
|
||||
|
||||
OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
|
||||
! dbops.$(O) hsort.$(O) simplecrypt.$(O)
|
||||
|
||||
BINS=cucipop makevpopdb
|
||||
|
||||
***************
|
||||
*** 70,77 ****
|
||||
install: $(BINS) $(MANS)
|
||||
$(INSTALL) $(BINPERM) $(BINS) $(BINDIR)
|
||||
$(INSTALL) $(REGPERM) $(MANS) $(MANDIR)
|
||||
! mkdir $(CUCIPOPLIB) 2>/dev/null; exit 0
|
||||
! mkdir $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
|
||||
@for a in $(BINS); do ls -l $(BINDIR)/$$a; done
|
||||
@for a in $(MANS); do ls -l $(MANDIR)/$$a; done
|
||||
|
||||
--- 70,77 ----
|
||||
install: $(BINS) $(MANS)
|
||||
$(INSTALL) $(BINPERM) $(BINS) $(BINDIR)
|
||||
$(INSTALL) $(REGPERM) $(MANS) $(MANDIR)
|
||||
! mkdir -p $(CUCIPOPLIB) 2>/dev/null; exit 0
|
||||
! mkdir -p $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
|
||||
@for a in $(BINS); do ls -l $(BINDIR)/$$a; done
|
||||
@for a in $(MANS); do ls -l $(MANDIR)/$$a; done
|
||||
|
||||
|
||||
@ -1,64 +1,19 @@
|
||||
--- cucipop.8.orig Fri Aug 1 05:05:59 1997
|
||||
+++ cucipop.8 Tue Oct 7 11:18:59 1997
|
||||
@@ -48,12 +48,12 @@
|
||||
.SH NAME
|
||||
cucipop \- Cubic Circle POP3 daemon
|
||||
.SH SYNOPSIS
|
||||
-.B /usr/sbin/cucipop
|
||||
+.B !!PREFIX!!/libexec/cucipop
|
||||
.RB [ \-qaYdPUSDAT ]
|
||||
.RB [ "\-E \fIage\fP" ]
|
||||
.RB [ "\-p \fIport\fP" ]
|
||||
.br
|
||||
-.B /usr/sbin/cucipop
|
||||
+.B !!PREFIX!!/libexec/cucipop
|
||||
.B \-v
|
||||
.ad
|
||||
.SH DESCRIPTION
|
||||
@@ -132,12 +132,12 @@
|
||||
.IR port .
|
||||
.SH EXAMPLES
|
||||
Typically
|
||||
-.I pop-3
|
||||
+.I pop3
|
||||
service is defined in
|
||||
.BR services (5)
|
||||
as follows:
|
||||
.Sx 1
|
||||
-pop-3 110/tcp
|
||||
+pop3 110/tcp
|
||||
.Ex
|
||||
In order to start cucipop from within
|
||||
.BR inetd (8),
|
||||
@@ -145,26 +145,26 @@
|
||||
.BR inetd.conf (5)
|
||||
would be suitable:
|
||||
.Sx 1
|
||||
-pop-3 stream tcp nowait root /usr/sbin/cucipop cucipop -Y
|
||||
+pop3 stream tcp nowait root !!PREFIX!!/libexec/cucipop cucipop -Y
|
||||
.Ex
|
||||
If your site gets many hits from popclients, it would be preferable
|
||||
to start cucipop standalone as in:
|
||||
.Sx 1
|
||||
-/usr/sbin/cucipop -Y
|
||||
+!!PREFIX!!/libexec/cucipop -Y
|
||||
.Ex
|
||||
Your typical BOFH setting would be:
|
||||
.Sx 1
|
||||
-/usr/sbin/cucipop -YaSE 6w
|
||||
+!!PREFIX!!/libexec/cucipop -YaSE 6w
|
||||
.Ex
|
||||
.SH FILES
|
||||
.TP 2.3i
|
||||
.B /etc/passwd
|
||||
for the default authentication method
|
||||
.TP
|
||||
-.B /var/spool/mail/$LOGNAME
|
||||
+.B /var/mail/$LOGNAME
|
||||
system mailbox
|
||||
.TP
|
||||
-.B /var/spool/mail/$LOGNAME.lock
|
||||
+.B /var/mail/$LOGNAME.lock
|
||||
lockfile for the system mailbox
|
||||
.TP
|
||||
.B _????`hostname`
|
||||
*** authenticate.c.orig Tue Jun 30 12:02:42 1998
|
||||
--- authenticate.c Tue Jun 30 12:04:50 1998
|
||||
***************
|
||||
*** 44,50 ****
|
||||
#define VIRTUALUSER "vpop"
|
||||
|
||||
#ifndef MAILSPOOLDIR
|
||||
! #define MAILSPOOLDIR "/var/spool/mail/" /* watch the trailing / */
|
||||
#endif
|
||||
#ifndef MAILSPOOLHASH
|
||||
#define MAILSPOOLHASH 0 /* 2 would deliver to /var/spool/mail/b/a/bar */
|
||||
--- 44,50 ----
|
||||
#define VIRTUALUSER "vpop"
|
||||
|
||||
#ifndef MAILSPOOLDIR
|
||||
! #define MAILSPOOLDIR "/var/mail/" /* watch the trailing / */
|
||||
#endif
|
||||
#ifndef MAILSPOOLHASH
|
||||
#define MAILSPOOLHASH 0 /* 2 would deliver to /var/spool/mail/b/a/bar */
|
||||
|
||||
@ -1,12 +1,19 @@
|
||||
*** xcreat.c.orig Tue Apr 21 22:03:37 1998
|
||||
--- xcreat.c Tue Apr 21 22:23:24 1998
|
||||
*** xcreat.c.orig Tue Jun 30 12:06:58 1998
|
||||
--- xcreat.c Tue Jun 30 12:06:33 1998
|
||||
***************
|
||||
*** 22,28 ****
|
||||
/*#define NOuname /* uncomment if uname is not available */
|
||||
/*#define NOstrpbrk /* uncomment if strpbrk is not available */
|
||||
/*#define strchr(s,c) index(s,c) /* uncomment if strchr is not available */
|
||||
- #define const /* can be undefined for ANSI compilers */
|
||||
! #define const /* can be undefined for ANSI compilers */
|
||||
|
||||
#include <unistd.h> /* open() close() link() unlink()
|
||||
getpid() */
|
||||
--- 22,28 ----
|
||||
/*#define NOuname /* uncomment if uname is not available */
|
||||
/*#define NOstrpbrk /* uncomment if strpbrk is not available */
|
||||
/*#define strchr(s,c) index(s,c) /* uncomment if strchr is not available */
|
||||
! /* #define const */ /* can be undefined for ANSI compilers */
|
||||
|
||||
#include <unistd.h> /* open() close() link() unlink()
|
||||
getpid() */
|
||||
--- 22,27 ----
|
||||
|
||||
@ -1,57 +1,152 @@
|
||||
*** config.h.orig Fri Aug 1 08:13:05 1997
|
||||
--- config.h Tue Apr 28 15:11:11 1998
|
||||
*** cucipop.8.orig Mon May 11 23:35:19 1998
|
||||
--- cucipop.8 Tue Jun 30 12:42:36 1998
|
||||
***************
|
||||
*** 1,9 ****
|
||||
/*$Id: patch-ad,v 1.1 1998/04/28 17:23:11 marc Exp $*/
|
||||
|
||||
! #define USEdot_lock /**/
|
||||
/*#define USEfcntl_lock /**/ /* to test which combinations make sense */
|
||||
/*#define USElockf /**/ /* run the lockingtest program part of */
|
||||
! /*#define USEflock /**/ /* the procmail installation process */
|
||||
|
||||
/*#define SHADOW_PASSWD /**/ /* shadow password library support */
|
||||
|
||||
--- 1,9 ----
|
||||
/*$Id: patch-ad,v 1.1 1998/04/28 17:23:11 marc Exp $*/
|
||||
|
||||
! /*#define USEdot_lock /**/
|
||||
/*#define USEfcntl_lock /**/ /* to test which combinations make sense */
|
||||
/*#define USElockf /**/ /* run the lockingtest program part of */
|
||||
! #define USEflock /**/ /* the procmail installation process */
|
||||
|
||||
/*#define SHADOW_PASSWD /**/ /* shadow password library support */
|
||||
|
||||
*** 48,59 ****
|
||||
.SH NAME
|
||||
cucipop \- Cubic Circle POP3 daemon
|
||||
.SH SYNOPSIS
|
||||
! .B /usr/sbin/cucipop
|
||||
.RB [ \-qaYdPUSDAT ]
|
||||
.RB [ "\-E \fIage\fP" ]
|
||||
.RB [ "\-p \fIport\fP" ]
|
||||
.br
|
||||
! .B /usr/sbin/cucipop
|
||||
.B \-v
|
||||
.ad
|
||||
.SH DESCRIPTION
|
||||
--- 48,59 ----
|
||||
.SH NAME
|
||||
cucipop \- Cubic Circle POP3 daemon
|
||||
.SH SYNOPSIS
|
||||
! .B /usr/local/libexec/cucipop
|
||||
.RB [ \-qaYdPUSDAT ]
|
||||
.RB [ "\-E \fIage\fP" ]
|
||||
.RB [ "\-p \fIport\fP" ]
|
||||
.br
|
||||
! .B /usr/local/libexec/cucipop
|
||||
.B \-v
|
||||
.ad
|
||||
.SH DESCRIPTION
|
||||
***************
|
||||
*** 12,18 ****
|
||||
#define APOP /**/
|
||||
#define TOP /**/
|
||||
|
||||
! /*#define LAST_HACK /**/ /* uncomment to enable dummy LAST */
|
||||
/* violates RFC1939 */
|
||||
|
||||
/* to change the MAILSPOOLDIR, edit authenticate.c */
|
||||
--- 12,18 ----
|
||||
#define APOP /**/
|
||||
#define TOP /**/
|
||||
|
||||
! #define LAST_HACK /**/ /* uncomment to enable dummy LAST */
|
||||
/* violates RFC1939 */
|
||||
|
||||
/* to change the MAILSPOOLDIR, edit authenticate.c */
|
||||
*** 132,143 ****
|
||||
.IR port .
|
||||
.SH EXAMPLES
|
||||
Typically
|
||||
! .I pop-3
|
||||
service is defined in
|
||||
.BR services (5)
|
||||
as follows:
|
||||
.Sx 1
|
||||
! pop-3 110/tcp
|
||||
.Ex
|
||||
In order to start cucipop from within
|
||||
.BR inetd (8),
|
||||
--- 132,143 ----
|
||||
.IR port .
|
||||
.SH EXAMPLES
|
||||
Typically
|
||||
! .I pop3
|
||||
service is defined in
|
||||
.BR services (5)
|
||||
as follows:
|
||||
.Sx 1
|
||||
! pop3 110/tcp
|
||||
.Ex
|
||||
In order to start cucipop from within
|
||||
.BR inetd (8),
|
||||
***************
|
||||
*** 62,68 ****
|
||||
\n\t-T\tdisable optional TOP command\
|
||||
\n\t-p port\tspecify port other than %d\n"
|
||||
|
||||
! /*#define LOG_FAILED_PASSWORD /* log failed passwords */
|
||||
|
||||
#define COPYBUF 32768 /* when doing in-situ copies */
|
||||
#define GROWSTEP 16
|
||||
--- 62,68 ----
|
||||
\n\t-T\tdisable optional TOP command\
|
||||
\n\t-p port\tspecify port other than %d\n"
|
||||
|
||||
! #define LOG_FAILED_PASSWORD /* log failed passwords */
|
||||
|
||||
#define COPYBUF 32768 /* when doing in-situ copies */
|
||||
#define GROWSTEP 16
|
||||
*** 145,164 ****
|
||||
.BR inetd.conf (5)
|
||||
would be suitable:
|
||||
.Sx 1
|
||||
! pop-3 stream tcp nowait root /usr/sbin/cucipop cucipop -Y
|
||||
.Ex
|
||||
If your site gets many hits from popclients, it would be preferable
|
||||
to start cucipop standalone as in:
|
||||
.Sx 1
|
||||
! /usr/sbin/cucipop -Y
|
||||
.Ex
|
||||
Your typical BOFH setting would be:
|
||||
.Sx 1
|
||||
! /usr/sbin/cucipop -YaSE 6w
|
||||
.Ex
|
||||
.SH FILES
|
||||
.TP 2.3i
|
||||
! .B /etc/passwd
|
||||
the default authentication
|
||||
.TP
|
||||
.B /etc/mail/vpop.db
|
||||
--- 145,164 ----
|
||||
.BR inetd.conf (5)
|
||||
would be suitable:
|
||||
.Sx 1
|
||||
! pop3 stream tcp nowait root /usr/local/libexec/cucipop cucipop -Y
|
||||
.Ex
|
||||
If your site gets many hits from popclients, it would be preferable
|
||||
to start cucipop standalone as in:
|
||||
.Sx 1
|
||||
! /usr/local/libexec/cucipop -Y
|
||||
.Ex
|
||||
Your typical BOFH setting would be:
|
||||
.Sx 1
|
||||
! /usr/local/libexec/cucipop -YaSE 6w
|
||||
.Ex
|
||||
.SH FILES
|
||||
.TP 2.3i
|
||||
! .B /etc/master.passwd
|
||||
the default authentication
|
||||
.TP
|
||||
.B /etc/mail/vpop.db
|
||||
***************
|
||||
*** 166,190 ****
|
||||
.BR makevpopdb (8)
|
||||
man page on how this file is created
|
||||
.TP
|
||||
! .B /var/lib/cucipop/state.db
|
||||
AI state information and bulletin history
|
||||
.TP
|
||||
! .B "/var/lib/cucipop/bulletins/\fInn\fP"
|
||||
.B 00
|
||||
through
|
||||
.B 63
|
||||
optional bulletin files in regular mailbox format
|
||||
.TP
|
||||
! .B /var/spool/mail/$LOGNAME
|
||||
system mailbox
|
||||
.TP
|
||||
! .B /var/spool/mail/virtual.dom.ain/$LOGNAME
|
||||
virtual host system mailbox
|
||||
.TP
|
||||
! .B /var/spool/mail/$LOGNAME.lock
|
||||
lockfile for the system mailbox
|
||||
.TP
|
||||
! .B /var/spool/mail/virtual.dom.ain/$LOGNAME.lock
|
||||
lockfile for the virtual host system mailbox
|
||||
.TP
|
||||
.B _????`hostname`
|
||||
--- 166,190 ----
|
||||
.BR makevpopdb (8)
|
||||
man page on how this file is created
|
||||
.TP
|
||||
! .B /var/cucipop/state.db
|
||||
AI state information and bulletin history
|
||||
.TP
|
||||
! .B "/var/cucipop/bulletins/\fInn\fP"
|
||||
.B 00
|
||||
through
|
||||
.B 63
|
||||
optional bulletin files in regular mailbox format
|
||||
.TP
|
||||
! .B /var/mail/$LOGNAME
|
||||
system mailbox
|
||||
.TP
|
||||
! .B /var/mail/virtual.dom.ain/$LOGNAME
|
||||
virtual host system mailbox
|
||||
.TP
|
||||
! .B /var/mail/$LOGNAME.lock
|
||||
lockfile for the system mailbox
|
||||
.TP
|
||||
! .B /var/mail/virtual.dom.ain/$LOGNAME.lock
|
||||
lockfile for the virtual host system mailbox
|
||||
.TP
|
||||
.B _????`hostname`
|
||||
|
||||
19
mail/cucipop/patches/patch-ae
Normal file
19
mail/cucipop/patches/patch-ae
Normal file
@ -0,0 +1,19 @@
|
||||
*** makevpopdb.8.orig Tue Jun 30 12:10:28 1998
|
||||
--- makevpopdb.8 Tue Jun 30 12:09:04 1998
|
||||
***************
|
||||
*** 48,54 ****
|
||||
.SH NAME
|
||||
makevpopdb \- Creates the vpop database for cucipop
|
||||
.SH SYNOPSIS
|
||||
! .B /usr/sbin/makevpopdb
|
||||
.I dbasefile
|
||||
.ad
|
||||
.SH DESCRIPTION
|
||||
--- 48,54 ----
|
||||
.SH NAME
|
||||
makevpopdb \- Creates the vpop database for cucipop
|
||||
.SH SYNOPSIS
|
||||
! .B /usr/local/libexec/makevpopdb
|
||||
.I dbasefile
|
||||
.ad
|
||||
.SH DESCRIPTION
|
||||
@ -1,2 +1,4 @@
|
||||
libexec/cucipop
|
||||
libexec/makevpopdb
|
||||
man/man8/cucipop.8
|
||||
man/man8/makevpopdb.8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user