comment out vhost support since it brings db2 vs. libc conflict in

certain situations.
Describe why it is impossible to use APOP in such situation even for
real accounts

6 files changed, 55 insertions, 42 deletions

diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 34f332a482d9..ff1965e527d9 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -3,18 +3,20 @@
 # Date created:		7 Jun 1997
 # Whom:			igor@zynaps.ru
 #
-# $Id: Makefile,v 1.5 1998/08/28 08:15:07 vanilla Exp $
+# $Id: Makefile,v 1.6 1999/03/29 02:01:33 ache Exp $
 #
 # NOTE: APOP works only for virtual hosts as designed!
+#       Virtual hosts works only with Berkeley DB2.
+#       Berkeley DB2 is in conflict with libc, so commented out. :-(
 
 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
+#BUILD_DEPENDS=  ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-MAN8=	cucipop.8 makevpopdb.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 ebea8d6512f3..107d914c74ea 100644
--- a/mail/cucipop/files/patch-aa
+++ b/mail/cucipop/files/patch-aa
@@ -9,22 +9,3 @@
  
  #include <unistd.h>			/* open() close() link() unlink()
  					   getpid() */
---- config.h.orig	Wed May 13 05:09:14 1998
-+++ config.h	Tue Aug 25 18:12:48 1998
-@@ -3,7 +3,7 @@
- #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 USEflock	/**/		/* the procmail installation process */
- 
- /*#define SHADOW_PASSWD /**/		  /* shadow password library support */
- 
-@@ -84,6 +84,6 @@
- #define MAXBULLETINS	64
- #define MAXSTATEAGE	8388608				       /* > 3 months */
- #define MEMORY_CACHE	(64*1024)
--#define CUCIPOP_LIB	"/var/lib/cucipop"
-+#define CUCIPOP_LIB	"/var/spool/cucipop"
- #define STATE_DB	"state.db"
- #define BULLETINS_PATH	CUCIPOP_LIB"/bulletins"
diff --git a/mail/cucipop/files/patch-ad b/mail/cucipop/files/patch-ad
index 7fd7c42b3c75..fbb90352a538 100644
--- a/mail/cucipop/files/patch-ad
+++ b/mail/cucipop/files/patch-ad
@@ -1,6 +1,6 @@
 --- Makefile.orig	Wed May 13 01:09:14 1998
-+++ Makefile	Mon Mar 29 00:38:08 1999
-@@ -1,30 +1,31 @@
++++ Makefile	Mon Mar 29 06:29:31 1999
+@@ -1,30 +1,32 @@
  #$Id: Makefile,v 1.18 1998/05/12 21:09:14 srb Exp $
  
 -BASENAME= /usr
@@ -18,8 +18,8 @@
  
 -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
++#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
@@ -36,12 +36,13 @@
 -BINPERM=02755 -s -g mail
 -REGPERM=0644
 +INSTALL=install -c -o bin -m
-+BINPERM=02555 -s -g mail
++BINLPERM=02555 -s -g mail
++BINSPERM=555 -s
 +REGPERM=0444
  
  #
  # When compiling without APOP support, the md5 library can be omitted.
-@@ -32,13 +33,14 @@
+@@ -32,13 +34,14 @@
  MD5_OBJ=md5/md5c.$(O)
  
  OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \
@@ -52,27 +53,31 @@
 +BINL=cucipop
 +BINS=makevpopdb
  
- MANS=cucipop.8 makevpopdb.8
+-MANS=cucipop.8 makevpopdb.8
++MANS=cucipop.8 #makevpopdb.8
  
 -all: $(BINS)
-+all: $(BINS) $(BINL)
++all: $(BINL) #$(BINS)
  
  cucipop: $(OBJS)
  	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
-@@ -67,11 +69,13 @@
+@@ -67,12 +70,14 @@
  $(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) $(BINPERM) $(BINS) $(BINDIR)
++install: $(BINL) $(MANS) #$(BINS)
++	$(INSTALL) $(BINLPERM) $(BINL) $(LIBEXECDIR)
++#        $(INSTALL) $(BINSPERM) $(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
 +	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 $(BINS); do ls -l $(BINDIR)/$$a; done
  	@for a in $(MANS); do ls -l $(MANDIR)/$$a; done
  
+ deinstall:
diff --git a/mail/cucipop/files/patch-ai b/mail/cucipop/files/patch-ai
new file mode 100644
index 000000000000..3839026ad03c
--- /dev/null
+++ b/mail/cucipop/files/patch-ai
@@ -0,0 +1,26 @@
+--- config.h.orig	Wed May 13 01:09:14 1998
++++ config.h	Mon Mar 29 06:21:42 1999
+@@ -3,13 +3,13 @@
+ #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 USEflock	/**/		/* the procmail installation process */
+ 
+ /*#define SHADOW_PASSWD /**/		  /* shadow password library support */
+ 
+ #define USER		/**/			  /* comment out, to disable */
+ #define UIDL		/**/		  /* the optional command completely */
+-#define APOP		/**/
++/*#define APOP            /**/
+ #define TOP		/**/
+ 
+ #define LAST_HACK	/**/		   /* uncomment to enable dummy LAST */
+@@ -84,6 +84,6 @@
+ #define MAXBULLETINS	64
+ #define MAXSTATEAGE	8388608				       /* > 3 months */
+ #define MEMORY_CACHE	(64*1024)
+-#define CUCIPOP_LIB	"/var/lib/cucipop"
++#define CUCIPOP_LIB	"/var/spool/cucipop"
+ #define STATE_DB	"state.db"
+ #define BULLETINS_PATH	CUCIPOP_LIB"/bulletins"
diff --git a/mail/cucipop/pkg-plist b/mail/cucipop/pkg-plist
index 5927e3811b03..bf1839f3aca4 100644
--- a/mail/cucipop/pkg-plist
+++ b/mail/cucipop/pkg-plist
@@ -1,2 +1 @@
 libexec/cucipop
-sbin/makevpopdb
diff --git a/mail/cucipop/scripts/pre-install b/mail/cucipop/scripts/pre-install
index 80e19cb195de..494cafe3bbd3 100644
--- a/mail/cucipop/scripts/pre-install
+++ b/mail/cucipop/scripts/pre-install
@@ -1,8 +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
+#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