Fix shared library linking (again).

Fix and enable pop support code.
Fix and enable slocal msgid support code (eliminates duplicates) if .db file
present.

3 files changed, 175 insertions, 13 deletions

diff --git a/mail/mh/files/patch-aa b/mail/mh/files/patch-aa
index 793bcaded6b0..d450a4342054 100644
--- a/mail/mh/files/patch-aa
+++ b/mail/mh/files/patch-aa
@@ -1,9 +1,9 @@
-*** /dev/null	Tue Oct  4 16:00:58 1994
---- conf/FreeBSD	Tue Oct  4 15:18:03 1994
+*** /dev/null	Thu Feb 22 04:05:03 1996
+--- conf/FreeBSD	Thu Feb 22 10:22:22 1996
 ***************
 *** 0 ****
 --- 1,26 ----
-+ # @(#)$Id: patch-aa,v 1.1.1.1 1994/10/04 23:32:54 pst Exp $
++ # @(#)$Id: patch-aa,v 1.2 1995/08/15 20:08:02 gpalmer Exp $
 + # FreeBSD running sendmail
 + 
 + bin	/usr/local/bin
@@ -20,12 +20,12 @@
 + 
 + # FreeBSD specific options (for FreeBSD-1.x, remove BSD44)
 + options	BSD42 BSD43 BSD44 WAITINT UNISTD VSPRINTF MORE='"/usr/bin/more"'
-+ options	NORUSERPASS DBMPWD POSIX NTOHLSWAP SYS5DIR OVERHEAD
++ options	NORUSERPASS DBMPWD POSIX NTOHLSWAP SYS5DIR OVERHEAD MSGID FCNTL
 + options	BIND MIME SENDMTS SMTP WHATNOW ZONEINFO
 + 
 + # If you want POP support, this will help you get started,  but feel
 + # free to customize it.
-+ #pop		on
-+ #popdir		/usr/local/libexec
-+ #options	MPOP RPOP
-+ #ldoptlibs	-lcrypt
++ pop		on
++ popdir		/usr/local/libexec
++ options		RPOP APOP='"/usr/local/etc/pop.auth"' POPSERVICE='"pop3"'
++ ldoptlibs	-lcrypt
diff --git a/mail/mh/files/patch-ac b/mail/mh/files/patch-ac
index 65730405c162..b843c70ecc0e 100644
--- a/mail/mh/files/patch-ac
+++ b/mail/mh/files/patch-ac
@@ -1,8 +1,27 @@
 *** slocal.c.orig	Tue Nov 30 20:01:38 1993
---- uip/slocal.c	Fri Jul  1 13:09:36 1994
+--- uip/slocal.c	Thu Feb 22 10:41:46 1996
+***************
+*** 44,49 ****
+--- 44,59 ----
+  
+  #ifdef	MSGID
+  
++ #ifdef	BSD44
++ #define	MSGID_PAGFILE ".maildelivery.db"
++ #define	MSGID_PAGFNO	dbm_dirfno
++ #else
++ #define	MSGID_PAGFILE ".maildelivery.pag"
++ #define	MSGID_PAGFNO	dbm_pagfno
++ #endif
++ 
++ static int check_msgid (int, char *);
++ 
+  #undef	DBM		/* used by ndbm.h */
+  #include <ndbm.h>
+  #include <stdio.h>
 ***************
 *** 173,178 ****
---- 173,180 ----
+--- 183,190 ----
       NULL
   };
   
@@ -13,7 +32,7 @@
   extern char **environ;
 ***************
 *** 299,304 ****
---- 301,308 ----
+--- 311,318 ----
   
   /*  */
   
@@ -23,8 +42,25 @@
   	addr = getusr ();
       if (user == NULL)
 ***************
+*** 379,385 ****
+  #ifdef	MSGID
+      struct stat st;
+  
+!     if (stat (".maildelivery.pag", &st) != NOTOK
+  	    && check_msgid (fd, ".maildelivery") == DONE)
+  	return OK;
+  #endif
+--- 393,399 ----
+  #ifdef	MSGID
+      struct stat st;
+  
+!     if (stat (MSGID_PAGFILE, &st) != NOTOK
+  	    && check_msgid (fd, ".maildelivery") == DONE)
+  	return OK;
+  #endif
+***************
 *** 543,549 ****
---- 547,569 ----
+--- 557,579 ----
   		status = usr_pipe (fd, tmpbuf, "/bin/sh", vec + 2);
   		break;
   
@@ -48,3 +84,96 @@
   		if (!uleq (action, "file"))
   		    continue;	/* else fall */
   	    case '>': 
+***************
+*** 1312,1330 ****
+  		    fl.l_whence = 0;
+  		    fl.l_start = 0;
+  		    fl.l_len = 0;
+! 		    if (fcntl (dbm_pagfno (db), F_SETLK, &fl) == -1) {
+  			advise (file, "unable to perform flock on");
+  			goto out;
+  		    }
+  		}
+  #else
+  #ifdef LOCKF
+! 		if (lockf (dbm_pagfno (db), F_LOCK) == NOTOK) {
+  		    advise (file, "unable to perform lockf on");
+  		    goto out;
+  		}
+  #else
+! 		if (flock (dbm_pagfno (db), LOCK_EX) == NOTOK) {
+  		    advise (file, "unable to perform flock on");
+  		    goto out;
+  		}
+--- 1342,1360 ----
+  		    fl.l_whence = 0;
+  		    fl.l_start = 0;
+  		    fl.l_len = 0;
+! 		    if (fcntl (MSGID_PAGFNO (db), F_SETLK, &fl) == -1) {
+  			advise (file, "unable to perform flock on");
+  			goto out;
+  		    }
+  		}
+  #else
+  #ifdef LOCKF
+! 		if (lockf (MSGID_PAGFNO (db), F_LOCK) == NOTOK) {
+  		    advise (file, "unable to perform lockf on");
+  		    goto out;
+  		}
+  #else
+! 		if (flock (MSGID_PAGFNO (db), LOCK_EX) == NOTOK) {
+  		    advise (file, "unable to perform flock on");
+  		    goto out;
+  		}
+*** popauth.c.orig	Tue Nov 30 20:01:34 1993
+--- support/pop/popauth.c	Thu Feb 22 13:00:20 1996
+***************
+*** 18,23 ****
+--- 18,28 ----
+  #include "../zotnet/bboards.h"
+  #include "../zotnet/mts.h"
+  
++ #ifdef	dbm_pagfno
++ #undef	dbm_pagfno
++ #define	dbm_pagfno	dbm_dirfno
++ #endif
++ 
+  /*  */
+  
+  static struct swit switches[] = {
+***************
+*** 130,137 ****
+  	if ((db = dbm_open (APOP, O_RDWR | O_CREAT, 0600)) == NULL)
+  	    adios (APOP, "unable to create POP authorization DB");
+  	if (fchown (dbm_dirfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
+! 	        || fchown (dbm_pagfno (db), pw -> pw_uid, pw -> pw_gid)
+! 	    		== NOTOK)
+  	    advise (" ", "error setting ownership of POP authorization DB");
+  
+  	done (0);
+--- 135,144 ----
+  	if ((db = dbm_open (APOP, O_RDWR | O_CREAT, 0600)) == NULL)
+  	    adios (APOP, "unable to create POP authorization DB");
+  	if (fchown (dbm_dirfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
+! #ifndef	BSD44
+! 	    || fchown (dbm_pagfno (db), pw -> pw_uid, pw -> pw_gid) == NOTOK
+! #endif
+! 	    )
+  	    advise (" ", "error setting ownership of POP authorization DB");
+  
+  	done (0);
+*** popser.c.orig	Tue Nov 30 20:01:34 1993
+--- support/pop/popser.c	Thu Feb 22 12:58:31 1996
+***************
+*** 666,671 ****
+--- 665,674 ----
+  #include <fcntl.h>
+  #endif
+  
++ #ifdef	dbm_pagfno
++ #undef	dbm_pagfno
++ #define	dbm_pagfno	dbm_dirfno
++ #endif
+  
+  static int apop (vec)
+  register char  **vec;
diff --git a/mail/mh/files/patch-ad b/mail/mh/files/patch-ad
index ecabad76f31c..378fbcc1a5bc 100644
--- a/mail/mh/files/patch-ad
+++ b/mail/mh/files/patch-ad
@@ -52,7 +52,7 @@
   		../mts/libmts.a  ../zotnet/libzot.a
 + @END: SYS5SHLIB
 + @BEGIN: FBSDSHLIB
-+ LDLIBES	=	../config/config.o @(SLDFLAG) -lmh$(SLIBVER) \
++ LDLIBES	=	../config/config.o @(SLDFLAG) -L../sbr -lmh$(SLIBVER) \
 + 		../mts/libmts.a  ../zotnet/libzot.a
 + @END: FBSDSHLIB
 + LIBES	=	../config/config.o ../sbr/libmh.so ../mts/libmts.a \
@@ -60,6 +60,39 @@
   LDLIBS	=	$(LDLIBES) ../config/version.o $(LDOPTLIB)
   @END: SHAREDLIB
   LINT	=	lint
+*** ../mh-6.8.3.orig/conf/makefiles/support/pop.orig	Thu Feb 22 13:05:50 1996
+--- conf/makefiles/support/pop	Thu Feb 22 13:10:18 1996
+***************
+*** 59,67 ****
+  @BEGIN: SHAREDLIB
+  LIBES2	=	../../config/config.o ../../sbr/libmh.so $(LIBES1)
+  LDLIBS1	=	$(LIBES1) $(LDOPTLIB)
+  LDLIBS2	=	../../config/config.o ../../config/version.o \
+  		-Bdynamic @(SLDFLAG) -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
+! @END: SHAREDLIB
+  
+  LINT	=	lint
+  LFLAGS	=	-bhu $(OPTIONS)
+--- 59,77 ----
+  @BEGIN: SHAREDLIB
+  LIBES2	=	../../config/config.o ../../sbr/libmh.so $(LIBES1)
+  LDLIBS1	=	$(LIBES1) $(LDOPTLIB)
++ @END: SHAREDLIB
++ @BEGIN: SUN4SHLIB
+  LDLIBS2	=	../../config/config.o ../../config/version.o \
+  		-Bdynamic @(SLDFLAG) -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
+! @END: SUN4SHLIB
+! @BEGIN: SYS5SHLIB
+! LDLIBS2	=	../../config/config.o ../../config/version.o \
+! 		-Bdynamic @(SLDFLAG) -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
+! @END: SYS5SHLIB
+! @BEGIN: FBSDSHLIB
+! LDLIBS2	=	../../config/config.o ../../config/version.o \
+! 		@(SLDFLAG) -L../../sbr -lmh$(SLIBVER) $(LIBES1) $(LDOPTLIB)
+! @END: FBSDSHLIB
+  
+  LINT	=	lint
+  LFLAGS	=	-bhu $(OPTIONS)
 *** ../mh-6.8.3.orig/conf/mhconfig.c	Wed Dec  1 06:00:24 1993
 --- conf/mhconfig.c	Tue Dec 27 19:08:40 1994
 ***************