bug 70992 patches to build 4.2 BSD.

4 files changed, 88 insertions, 5 deletions

diff --git a/security/coreconf/BSD_OS.mk b/security/coreconf/BSD_OS.mk
new file mode 100644
index 000000000..fe0fe92ec
--- /dev/null
+++ b/security/coreconf/BSD_OS.mk
@@ -0,0 +1,83 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+#
+# Contributor(s): Kurt J. Lidl
+#
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable
+# instead of those above.  If you wish to allow use of your
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+# Config stuff for BSD/OS
+#
+
+include $(CORE_DEPTH)/coreconf/UNIX.mk
+
+DEFAULT_COMPILER	= gcc
+CC			= gcc
+CCC			= g++
+RANLIB			= ranlib
+
+ifeq ($(OS_TEST),i386)
+	OS_REL_CFLAGS	= -D__i386__
+	CPU_ARCH	= x86
+else
+ifeq ($(OS_TEST),ppc)
+	OS_REL_CFLAGS	= -D__ppc__
+	CPU_ARCH	= ppc
+else
+ifeq ($(OS_TEST),sparc)
+	OS_REL_CFLAGS	= -D__sparc__
+	CPU_ARCH	= sparc
+else
+# treat the ultrasparc like a regular sparc, at least for now!
+ifeq ($(OS_TEST),sparc_v9)
+	OS_REL_CFLAGS	= -D__sparc__
+	CPU_ARCH	= sparc
+endif
+endif
+endif
+endif
+
+DLL_SUFFIX		= so
+
+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -DBSD_OS -DBSDI -Dunix -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
+ARCH			= bsdos
+
+DSO_CFLAGS		= -fPIC -DPIC
+DSO_LDOPTS		= -shared
+DSO_LDFLAGS		=
+DSO_LDOPTS		+= -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+
+ifdef LIBRUNPATH
+DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
+endif
+
+MKSHLIB			= $(CC) $(DSO_LDOPTS)
+
+G++INCLUDES		= -I/usr/include/g++
+
+INCLUDES		+= -I/usr/X11R6/include
diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk
index 4ee42b0b9..b854a43e5 100644
--- a/security/coreconf/arch.mk
+++ b/security/coreconf/arch.mk
@@ -67,11 +67,11 @@ ifeq ($(OS_ARCH),IRIX64)
 endif
 
 #
-# Force the newer BSDI versions to use the old arch name.
+# Force the older BSD/OS versions to use the new arch name.
 #
 
-ifeq ($(OS_ARCH),BSD_OS)
-	OS_ARCH = BSD_386
+ifeq ($(OS_ARCH),BSD_386)
+	OS_ARCH = BSD_OS
 endif
 
 #
diff --git a/security/coreconf/config.mk b/security/coreconf/config.mk
index 613d3bc2e..0eb5fc93f 100644
--- a/security/coreconf/config.mk
+++ b/security/coreconf/config.mk
@@ -56,7 +56,7 @@ include $(CORE_DEPTH)/coreconf/command.mk
 #       each OS release.                                              #
 #######################################################################
 
-ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET)))
+ifeq (,$(filter-out BSD_OS NetBSD OS2,$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 else
 include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk
diff --git a/security/coreconf/nsinstall/pathsub.c b/security/coreconf/nsinstall/pathsub.c
index 4d5728833..ee1e981cf 100644
--- a/security/coreconf/nsinstall/pathsub.c
+++ b/security/coreconf/nsinstall/pathsub.c
@@ -35,7 +35,7 @@
 ** Pathname subroutines.
 */
 #include <assert.h>
-#ifdef FREEBSD
+#if defined(FREEBSD) || defined(BSDI)
 #include <sys/types.h>
 #endif /* FREEBSD */
 #include <dirent.h>