summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>1999-03-29 02:01:38 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>1999-03-29 02:01:38 +0000
commitb2fa6925a0f1985e57b91738b1227990eef0d220 (patch)
tree970e1f63cc38ac51edbcae46b003dfcd3ecb0f2e /mail
parentUpgrade to v1.5.8p2 (diff)
turn on virtual hosts support
Notes
Notes: svn path=/head/; revision=17422
Diffstat (limited to 'mail')
-rw-r--r--mail/cucipop/Makefile7
-rw-r--r--mail/cucipop/files/patch-aa79
-rw-r--r--mail/cucipop/files/patch-ab19
-rw-r--r--mail/cucipop/files/patch-ad78
-rw-r--r--mail/cucipop/files/patch-ae11
-rw-r--r--mail/cucipop/files/patch-af18
-rw-r--r--mail/cucipop/files/patch-ag20
-rw-r--r--mail/cucipop/files/patch-ah11
-rw-r--r--mail/cucipop/pkg-plist1
-rw-r--r--mail/cucipop/scripts/configure3
-rw-r--r--mail/cucipop/scripts/pre-install8
11 files changed, 167 insertions, 88 deletions
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 53758547638b..34f332a482d9 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -3,15 +3,18 @@
# Date created: 7 Jun 1997
# Whom: igor@zynaps.ru
#
-# $Id: Makefile,v 1.4 1998/08/26 09:38:47 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/08/28 08:15:07 vanilla Exp $
#
+# NOTE: APOP works only for virtual hosts as designed!
DISTNAME= cucipop-1.31
CATEGORIES= mail
MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
+BUILD_DEPENDS= ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db
+
MAINTAINER= vanilla@FreeBSD.ORG
-MAN8= cucipop.8
+MAN8= cucipop.8 makevpopdb.8
.include <bsd.port.mk>
diff --git a/mail/cucipop/files/patch-aa b/mail/cucipop/files/patch-aa
index 1c4f87c6ea53..ebea8d6512f3 100644
--- a/mail/cucipop/files/patch-aa
+++ b/mail/cucipop/files/patch-aa
@@ -1,14 +1,3 @@
---- authenticate.c.orig Tue Aug 25 17:35:12 1998
-+++ authenticate.c Tue Aug 25 17:35:28 1998
-@@ -44,7 +44,7 @@
- #define VIRTUALUSER "vpop"
-
- #ifndef MAILSPOOLDIR
--#define MAILSPOOLDIR "/var/spool/mail/" /* watch the trailing / */
-+#define MAILSPOOLDIR "/var/mail/" /* watch the trailing / */
- #endif
- #ifndef MAILSPOOLHASH
- #define MAILSPOOLHASH 0 /* 2 would deliver to /var/spool/mail/b/a/bar */
--- xcreat.c.orig Tue Aug 25 17:35:46 1998
+++ xcreat.c Tue Aug 25 17:36:03 1998
@@ -22,7 +22,7 @@
@@ -39,71 +28,3 @@
+#define CUCIPOP_LIB "/var/spool/cucipop"
#define STATE_DB "state.db"
#define BULLETINS_PATH CUCIPOP_LIB"/bulletins"
---- Makefile.orig Tue May 12 16:09:14 1998
-+++ Makefile Thu Oct 15 21:27:10 1998
-@@ -1,30 +1,30 @@
- #$Id: Makefile,v 1.18 1998/05/12 21:09:14 srb Exp $
-
--BASENAME= /usr
-+BASENAME= $(PREFIX)
-
--GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
-- -Wpointer-arith -Wconversion -Waggregate-return \
-+#CC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
-+# -Wpointer-arith -Wconversion -Waggregate-return \
- #-Wimplicit -Wshadow #-Wuninitialized
-
- #
- # 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
-+#CFLAGS = -O -DUSE_DB #$(GCC_WARNINGS)
-+LDFLAGS += -lcrypt -lmd
-
- # If you change this, edit config.h as well
--CUCIPOPLIB=/var/lib/cucipop
-+CUCIPOPLIB=/var/spool/cucipop
- CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
-
- 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 -c -o bin -m
-+BINPERM=02555 -s -g mail
-+REGPERM=0444
-
- #
- # When compiling without APOP support, the md5 library can be omitted.
-@@ -32,11 +32,11 @@
- MD5_OBJ=md5/md5c.$(O)
-
- OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
-- dbops.$(O) hsort.$(O) simplecrypt.$(O) $(MD5_OBJ)
-+ dbops.$(O) hsort.$(O) simplecrypt.$(O)
-
--BINS=cucipop makevpopdb
-+BINS=cucipop# makevpopdb
-
--MANS=cucipop.8 makevpopdb.8
-+MANS=cucipop.8
-
- all: $(BINS)
-
-@@ -70,8 +70,8 @@
- 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
-+ 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
diff --git a/mail/cucipop/files/patch-ab b/mail/cucipop/files/patch-ab
index ab9954c78984..587206666e9c 100644
--- a/mail/cucipop/files/patch-ab
+++ b/mail/cucipop/files/patch-ab
@@ -1,5 +1,5 @@
---- cucipop.8.orig Tue May 12 00:35:19 1998
-+++ cucipop.8 Tue Aug 25 17:41:00 1998
+--- cucipop.8.orig Mon May 11 20:35:19 1998
++++ cucipop.8 Mon Mar 29 01:58:05 1999
@@ -48,12 +48,12 @@
.SH NAME
cucipop \- Cubic Circle POP3 daemon
@@ -30,12 +30,12 @@
.Ex
In order to start cucipop from within
.BR inetd (8),
-@@ -145,16 +145,16 @@
+@@ -145,46 +145,46 @@
.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 /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:
@@ -50,16 +50,21 @@
.Ex
.SH FILES
.TP 2.3i
-@@ -166,25 +166,25 @@
+ .B /etc/passwd
+ the default authentication
+ .TP
+-.B /etc/mail/vpop.db
++.B !!PREFIX!!/etc/vpop.db
+ virtual host authentication, see the
.BR makevpopdb (8)
man page on how this file is created
.TP
-.B /var/lib/cucipop/state.db
-+.B !!PREFIX!!/lib/cucipop/state.db
++.B /var/spool/cucipop/state.db
AI state information and bulletin history
.TP
-.B "/var/lib/cucipop/bulletins/\fInn\fP"
-+.B "!!PREFIX!!/lib/cucipop/bulletins/\fInn\fP"
++.B "/var/spool/cucipop/bulletins/\fInn\fP"
.B 00
through
.B 63
diff --git a/mail/cucipop/files/patch-ad b/mail/cucipop/files/patch-ad
new file mode 100644
index 000000000000..7fd7c42b3c75
--- /dev/null
+++ b/mail/cucipop/files/patch-ad
@@ -0,0 +1,78 @@
+--- Makefile.orig Wed May 13 01:09:14 1998
++++ Makefile Mon Mar 29 00:38:08 1999
+@@ -1,30 +1,31 @@
+ #$Id: Makefile,v 1.18 1998/05/12 21:09:14 srb Exp $
+
+-BASENAME= /usr
++BASENAME= $(PREFIX)
+
+-GCC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
+- -Wpointer-arith -Wconversion -Waggregate-return \
++#CC_WARNINGS = -O2 -pedantic -Wreturn-type -Wunused -Wformat \
++# -Wpointer-arith -Wconversion -Waggregate-return \
+ #-Wimplicit -Wshadow #-Wuninitialized
+
+ #
+ # 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
++CFLAGS += -DUSE_DB -DSENDMAILLIB=\"${PREFIX}/etc\" -I${PREFIX}/include
++LDFLAGS += -lcrypt -lmd -L${PREFIX}/lib -ldb2
+
+ # If you change this, edit config.h as well
+-CUCIPOPLIB=/var/lib/cucipop
++CUCIPOPLIB=/var/spool/cucipop
+ CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
+
+ O=o
+
+ BINDIR=$(BASENAME)/sbin
++LIBEXECDIR=$(BASENAME)/libexec
+ MANDIR=$(BASENAME)/man/man8
+
+-INSTALL=install -o root -m
+-BINPERM=02755 -s -g mail
+-REGPERM=0644
++INSTALL=install -c -o bin -m
++BINPERM=02555 -s -g mail
++REGPERM=0444
+
+ #
+ # When compiling without APOP support, the md5 library can be omitted.
+@@ -32,13 +33,14 @@
+ MD5_OBJ=md5/md5c.$(O)
+
+ OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
+- dbops.$(O) hsort.$(O) simplecrypt.$(O) $(MD5_OBJ)
++ dbops.$(O) hsort.$(O) simplecrypt.$(O)
+
+-BINS=cucipop makevpopdb
++BINL=cucipop
++BINS=makevpopdb
+
+ MANS=cucipop.8 makevpopdb.8
+
+-all: $(BINS)
++all: $(BINS) $(BINL)
+
+ cucipop: $(OBJS)
+ $(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
+@@ -67,11 +69,13 @@
+ $(MD5_OBJ): md5/md5c.c md5/md5.h
+ cd md5; $(CC) $(CFLAGS) -c md5c.c
+
+-install: $(BINS) $(MANS)
++install: $(BINS) $(BINL) $(MANS)
++ $(INSTALL) $(BINPERM) $(BINL) $(LIBEXECDIR)
+ $(INSTALL) $(BINPERM) $(BINS) $(BINDIR)
+ $(INSTALL) $(REGPERM) $(MANS) $(MANDIR)
+- mkdir $(CUCIPOPLIB) 2>/dev/null; exit 0
+- mkdir $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
++ mkdir -p $(CUCIPOPLIB) 2>/dev/null; exit 0
++ mkdir -p $(CUCIPOPBULLETINS) 2>/dev/null; exit 0
++ @for a in $(BINL); do ls -l $(LIBEXECDIR)/$$a; done
+ @for a in $(BINS); do ls -l $(BINDIR)/$$a; done
+ @for a in $(MANS); do ls -l $(MANDIR)/$$a; done
+
diff --git a/mail/cucipop/files/patch-ae b/mail/cucipop/files/patch-ae
new file mode 100644
index 000000000000..30aa5fd33803
--- /dev/null
+++ b/mail/cucipop/files/patch-ae
@@ -0,0 +1,11 @@
+--- dbops.c.bak Wed May 13 20:57:39 1998
++++ dbops.c Mon Mar 29 01:24:41 1999
+@@ -117,7 +117,7 @@
+ if(lastcheck!=curt)
+ { lastcheck=curt;
+ if(!cs)
+- { db->cursor(db,0,&cs);d.data="";d.size=1;
++ { db->cursor(db,0,&cs,0);d.data="";d.size=1;
+ if(!db->get(db,0,&d,&k,0))
+ cs->c_get(cs,&k,&d,DB_SET);
+ }
diff --git a/mail/cucipop/files/patch-af b/mail/cucipop/files/patch-af
new file mode 100644
index 000000000000..eba6a64a2c3b
--- /dev/null
+++ b/mail/cucipop/files/patch-af
@@ -0,0 +1,18 @@
+--- authenticate.c.orig Wed May 13 20:57:39 1998
++++ authenticate.c Mon Mar 29 03:11:18 1999
+@@ -39,12 +39,14 @@
+
+ #define VIRTUALSERVER /**/
+
++#ifndef SENDMAILLIB
+ #define SENDMAILLIB "/etc/mail"
++#endif
+ #define VIRTUALHOSTDB "vpop.db"
+ #define VIRTUALUSER "vpop"
+
+ #ifndef MAILSPOOLDIR
+-#define MAILSPOOLDIR "/var/spool/mail/" /* watch the trailing / */
++#define MAILSPOOLDIR "/var/mail/" /* watch the trailing / */
+ #endif
+ #ifndef MAILSPOOLHASH
+ #define MAILSPOOLHASH 0 /* 2 would deliver to /var/spool/mail/b/a/bar */
diff --git a/mail/cucipop/files/patch-ag b/mail/cucipop/files/patch-ag
new file mode 100644
index 000000000000..c12762da6629
--- /dev/null
+++ b/mail/cucipop/files/patch-ag
@@ -0,0 +1,20 @@
+--- makevpopdb.8.bak Sun May 10 16:57:40 1998
++++ makevpopdb.8 Mon Mar 29 01:51:22 1999
+@@ -48,7 +48,7 @@
+ .SH NAME
+ makevpopdb \- Creates the vpop database for cucipop
+ .SH SYNOPSIS
+-.B /usr/sbin/makevpopdb
++.B !!PREFIX!!/sbin/makevpopdb
+ .I dbasefile
+ .ad
+ .SH DESCRIPTION
+@@ -71,7 +71,7 @@
+ .SH FILES
+ .TP 2.3i
+ .TP
+-.B /etc/mail/vpop.db
++.B !!PREFIX!!/etc/vpop.db
+ typical virtual host authentication database used by
+ .BR cucipop (8)
+ .SH "SEE ALSO"
diff --git a/mail/cucipop/files/patch-ah b/mail/cucipop/files/patch-ah
new file mode 100644
index 000000000000..5def6536d00b
--- /dev/null
+++ b/mail/cucipop/files/patch-ah
@@ -0,0 +1,11 @@
+--- makevpopdb.c.bak Tue May 12 04:50:53 1998
++++ makevpopdb.c Mon Mar 29 04:30:00 1999
+@@ -49,7 +49,7 @@
+ }
+ dbname=argv[1];
+ memset(&dbenv,0,sizeof dbenv);
+- if(!db_appinit(0,0,&dbenv,0))
++ if(db_appinit(0,0,&dbenv,0))
+ fprintf(stderr,"makedb2: Can't init db subsystem\n"),retval=EX_CANTCREAT;
+ else
+ { if(db_open(dbname,DB_HASH,DB_CREATE|DB_TRUNCATE,0666,&dbenv,(void*)0,&db))
diff --git a/mail/cucipop/pkg-plist b/mail/cucipop/pkg-plist
index bf1839f3aca4..5927e3811b03 100644
--- a/mail/cucipop/pkg-plist
+++ b/mail/cucipop/pkg-plist
@@ -1 +1,2 @@
libexec/cucipop
+sbin/makevpopdb
diff --git a/mail/cucipop/scripts/configure b/mail/cucipop/scripts/configure
index a16b87d22fd7..1251b76f659e 100644
--- a/mail/cucipop/scripts/configure
+++ b/mail/cucipop/scripts/configure
@@ -2,3 +2,6 @@
mv ${WRKSRC}/cucipop.8 ${WRKSRC}/cucipop.8.bak
sed <${WRKSRC}/cucipop.8.bak >${WRKSRC}/cucipop.8 s+!!PREFIX!!+$PREFIX+g
+
+mv ${WRKSRC}/makevpopdb.8 ${WRKSRC}/makevpopdb.8.bak
+sed <${WRKSRC}/makevpopdb.8.bak >${WRKSRC}/makevpopdb.8 s+!!PREFIX!!+$PREFIX+g
diff --git a/mail/cucipop/scripts/pre-install b/mail/cucipop/scripts/pre-install
new file mode 100644
index 000000000000..80e19cb195de
--- /dev/null
+++ b/mail/cucipop/scripts/pre-install
@@ -0,0 +1,8 @@
+#!/bin/sh
+if ! id -u vpop > /dev/null 2>&1; then
+ echo
+ echo "Fake account \"vpop\" needed for virtual hosts support (as mboxes owner)."
+ echo "Please add it by hand in case you need them (try \"man vipw\")."
+ echo
+fi
+exit 0