upgrade to Navigator 4.51 and Fortify 1.4.1; Michael W Peterson <michael@flash.net>

This commit is contained in:
brad 1999-04-26 21:13:57 +00:00
parent 1bcc3e8741
commit 9d0765eadc
7 changed files with 261 additions and 146 deletions

View File

@ -1,23 +1,23 @@
# $OpenBSD: Makefile,v 1.6 1998/12/16 20:18:24 marc Exp $
# $OpenBSD: Makefile,v 1.7 1999/04/26 21:13:57 brad Exp $
#
# Relevant URLs: http://www.bsdi.com/netscape/
# http://www.fortify.net/
# WARNING: Requires a kernel built with 'option COMPAT_BSDOS'
#
DISTNAME= navigator-v45-export.x86-bsdi-bsd2
PKGNAME= navigator-4.5-fortified
DISTNAME= navigator-v451-export.x86-bsdi-bsd2
PKGNAME= navigator-4.51-fortified
CATEGORIES= www
DIST_SUBDIR= ${PKGNAME}
WRKSRC= ${WRKDIR}
NO_CDROM= "NOFEE: see http://www.fortify.net/copyright.txt"
ONLY_FOR_ARCHS= i386
NAVIGATORNAME= navigator-v45.x86-bsdi-bsd2
NAVIGATORNAME= navigator-v451.x86-bsdi-bsd2
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/4.5/english/unix/unsupported/bsdi21/navigator_standalone/
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/4.51/english/unix/unsupported/bsdi21/navigator_standalone/
FORTIFYNAME= Fortify-1.3.0-unix-x86
FORTIFYNAME= Fortify-1.4.1-unix-x86
MASTER_SITES+= ftp://fortify.net/pub/Fortify/ \
ftp://ftp.sunet.se/pub/security/tools/net/Fortify/ \
@ -44,15 +44,18 @@ pre-fetch:
.endif
do-build:
@cd ${WRKDIR}/${FORTIFYNAME}/src && \
@cd ${WRKDIR}/${FORTIFYNAME}/src/common && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} all && \
cd ${WRKDIR}/${FORTIFYNAME}/src/cmdline && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} fortify
do-install:
@cd ${WRKDIR}/${NAVIGATORNAME} && ${MAKE_ENV} ./ns-install
post-install:
@cd ${WRKDIR}/${FORTIFYNAME} && src/fortify ${PREFIX}/netscape/netscape
@sed 's#y0y0y0#${PREFIX}/netscape#' ${FILESDIR}/netscape > ${WRKDIR}/netscape
@cd ${WRKDIR}/${FORTIFYNAME} && \
src/cmdline/fortify ${PREFIX}/netscape/netscape
@sed 's#@netscape_home@#${PREFIX}/netscape#' ${FILESDIR}/netscape > ${WRKDIR}/netscape
-if test -f ${PREFIX}/bin/netscape ; then \
${MV} ${PREFIX}/bin/netscape ${PREFIX}/bin/netscape.old ; fi
@${INSTALL_SCRIPT} ${WRKDIR}/netscape ${PREFIX}/bin

View File

@ -1,6 +1,6 @@
MD5 (navigator-4.5-fortified/Fortify-1.3.0-unix-x86.tar.gz) = 0291a7dd45f1d47018a7ab7bc3319b57
MD5 (navigator-4.5-fortified/navigator-v45-export.x86-bsdi-bsd2.tar.gz) = af361814338e92aec18b978d24dac0d6
RMD160 (navigator-4.5-fortified/Fortify-1.3.0-unix-x86.tar.gz) = 073d8807b0866fa028a352b2c193537ebb47baa1
RMD160 (navigator-4.5-fortified/navigator-v45-export.x86-bsdi-bsd2.tar.gz) = 46181e71a28bf74ad38c327b39723cfb37464465
SHA1 (navigator-4.5-fortified/Fortify-1.3.0-unix-x86.tar.gz) = ea9e83cd3b7b62879e0c4f0abf5523ce62691b87
SHA1 (navigator-4.5-fortified/navigator-v45-export.x86-bsdi-bsd2.tar.gz) = f259c486a1754d7f0be7621d42d5250db82ec5b8
MD5 (navigator-4.51-fortified/navigator-v451-export.x86-bsdi-bsd2.tar.gz) = 372090644a3d28ad43c4e4a936260cb3
MD5 (navigator-4.51-fortified/Fortify-1.4.1-unix-x86.tar.gz) = 561c6405619de7c37d34426b4cff80a2
SHA1 (navigator-4.51-fortified/navigator-v451-export.x86-bsdi-bsd2.tar.gz) = 4753980c546bd0680bf5298c8f3156c901defc3b
SHA1 (navigator-4.51-fortified/Fortify-1.4.1-unix-x86.tar.gz) = 5b0204d152a2f44cca30007aa4bbbb5dd784e311
RMD160 (navigator-4.51-fortified/navigator-v451-export.x86-bsdi-bsd2.tar.gz) = d7c0ec8ce4978b8d67ca78cc09ee2a53e088de85
RMD160 (navigator-4.51-fortified/Fortify-1.4.1-unix-x86.tar.gz) = 4662dbf6dc8b0c475c63493f5827e6f06176acc1

View File

@ -4,8 +4,6 @@
#
# dugsong@OpenBSD.ORG
MOZILLA_HOME=y0y0y0
MOZILLA_HOME=@netscape_home@
export MOZILLA_HOME
exec $MOZILLA_HOME/netscape $*
exec $MOZILLA_HOME/netscape "$@"

View File

@ -1,106 +1,176 @@
--- navigator-v45.x86-bsdi-bsd2/ns-install.orig Thu Mar 26 20:48:42 1998
+++ navigator-v45.x86-bsdi-bsd2/ns-install Sun Jun 21 20:56:02 1998
@@ -87,21 +87,9 @@
*** navigator-v451.x86-bsdi-bsd2/ns-install.orig Mon Mar 1 02:58:55 1999
--- navigator-v451.x86-bsdi-bsd2/ns-install Sat Apr 24 10:09:11 1999
***************
*** 87,107 ****
fi
#
-# If MOZILLA_HOME is set, assume that is the place to install.
-# Otherwise, make an educated guess at the "right" default
-# directory.
+# We use OpenBSD's ports environment instead.
! # If MOZILLA_HOME is set, assume that is the place to install.
! # Otherwise, make an educated guess at the "right" default
! # directory.
#
-if test ! -z "${MOZILLA_HOME}"
-then
- INSTALL_DIR="${MOZILLA_HOME}"
-else
- if test -d /opt
- then
- INSTALL_DIR="/opt/netscape"
- else
- INSTALL_DIR="/usr/local/netscape"
- fi
-fi
+INSTALL_DIR="${PREFIX}/netscape"
! if test ! -z "${MOZILLA_HOME}"
! then
! INSTALL_DIR="${MOZILLA_HOME}"
! else
! if test -d /opt
! then
! INSTALL_DIR="/opt/netscape"
! else
! INSTALL_DIR="/usr/local/netscape"
! fi
! fi
#
# See if we have to use the lame SYS-V echo command flags.
@@ -139,46 +127,19 @@
--- 87,95 ----
fi
#
! # We use OpenBSD's ports environment instead.
#
! INSTALL_DIR="${PREFIX}/netscape"
#
# See if we have to use the lame SYS-V echo command flags.
***************
*** 139,184 ****
fi
done
-echo ""
-echo "Please specify the directory path under which the software will be"
-echo "installed. The default directory is ${INSTALL_DIR}, but you may"
-echo "install anywhere you wish (if you have permission to do so)."
-echo ""
- echo ""
- echo "Please specify the directory path under which the software will be"
- echo "installed. The default directory is ${INSTALL_DIR}, but you may"
- echo "install anywhere you wish (if you have permission to do so)."
- echo ""
flag=1
while test ${flag} -eq 1
do
- ${ECHO} "Location for ${PRODUCT} software [${INSTALL_DIR}]: ${ENDER}"
- read TARGET
- if test -z "${TARGET}"
- then
- TARGET="${INSTALL_DIR}"
- fi
- if test ! -z "`echo ${TARGET} | grep '~'`"
- then
- TARGET=`echo ${TARGET} | sed "s:~:${HOME}:"`
- fi
+ TARGET="${INSTALL_DIR}"
! ${ECHO} "Location for ${PRODUCT} software [${INSTALL_DIR}]: ${ENDER}"
! read TARGET
! if test -z "${TARGET}"
! then
! TARGET="${INSTALL_DIR}"
! fi
! if test ! -z "`echo ${TARGET} | grep '~'`"
! then
! TARGET=`echo ${TARGET} | sed "s:~:${HOME}:"`
! fi
flag=0
if test ! -d ${TARGET}
then
- echo ""
- ${ECHO} "${TARGET}: No such directory. Do you wish to create it? (y/n)[y] ${ENDER}"
- read check
- if test "${check}" = "n" -o "${check}" = "N"
+ mkdir -p ${TARGET}
+ if test $? -ne 0
! echo ""
! ${ECHO} "${TARGET}: No such directory. Do you wish to create it? (y/n)[y] ${ENDER}"
! read check
! if test "${check}" = "n" -o "${check}" = "N"
then
- flag=1
- else
- #
- # The -p flag may cause an error on some HP-UX systems.
- # Removing the -p will work for 'basename TARGET' as long
- # as 'dirname TARGET' exists.
- #
- mkdir -p ${TARGET}
- if test $? -ne 0
- then
- echo "ERROR: Problem creating ${TARGET}"
- exit 2
- fi
+ echo "ERROR: Problem creating ${TARGET}"
+ exit 2
! flag=1
! else
! #
! # The -p flag may cause an error on some HP-UX systems.
! # Removing the -p will work for 'basename TARGET' as long
! # as 'dirname TARGET' exists.
! #
! mkdir -p ${TARGET}
! if test $? -ne 0
! then
! echo "ERROR: Problem creating ${TARGET}"
! exit 2
! fi
fi
else
echo ""
@@ -186,13 +147,13 @@
--- 127,145 ----
fi
done
flag=1
while test ${flag} -eq 1
do
! TARGET="${INSTALL_DIR}"
flag=0
if test ! -d ${TARGET}
then
! mkdir -p ${TARGET}
! if test $? -ne 0
then
! echo "ERROR: Problem creating ${TARGET}"
! exit 2
fi
else
echo ""
***************
*** 186,198 ****
echo ""
echo "The existing contents may be modified or replaced if you install in"
echo "this directory. If you choose not to install in '${TARGET}',"
- echo "you will be prompted for a different directory."
+ echo "you should set your PREFIX environment variable and try again."
! echo "you will be prompted for a different directory."
echo ""
${ECHO} "Do you wish to install in '${TARGET}'? (y/n)[y] ${ENDER}"
read check
if test "${check}" = "n" -o "${check}" = "N"
then
- flag=1
+ exit 2
! flag=1
fi
fi
@@ -203,9 +164,9 @@
--- 147,159 ----
echo ""
echo "The existing contents may be modified or replaced if you install in"
echo "this directory. If you choose not to install in '${TARGET}',"
! echo "you should set your PREFIX environment variable and try again."
echo ""
${ECHO} "Do you wish to install in '${TARGET}'? (y/n)[y] ${ENDER}"
read check
if test "${check}" = "n" -o "${check}" = "N"
then
! exit 2
fi
fi
***************
*** 203,211 ****
then
echo ""
echo "You do not have write permission in ${TARGET}."
- echo "Change the permissions, or select another directory, and try again."
+ echo "Change the permissions and try again."
! echo "Change the permissions, or select another directory, and try again."
echo ""
- flag=1
+ exit 2
! flag=1
else
/bin/rm -f ${TARGET}/${TESTFILE}
fi
--- 164,172 ----
then
echo ""
echo "You do not have write permission in ${TARGET}."
! echo "Change the permissions and try again."
echo ""
! exit 2
else
/bin/rm -f ${TARGET}/${TESTFILE}
fi
***************
*** 294,303 ****
# avoid users having to set MOZILLA_JAVA_FONT_PROPERTY_PATH, or
# just assuming Java font-handling is broken.
#
! if test ! -z "`ls /bin/uname`"
then
MOVE_FONTS="TRUE"
! case `/bin/uname` in
AIX)
PLATFORM="aix"
;;
--- 255,264 ----
# avoid users having to set MOZILLA_JAVA_FONT_PROPERTY_PATH, or
# just assuming Java font-handling is broken.
#
! if test ! -z "`ls /usr/bin/uname`"
then
MOVE_FONTS="TRUE"
! case `/usr/bin/uname` in
AIX)
PLATFORM="aix"
;;

View File

@ -1,42 +1,42 @@
*** Fortify-1.3.0-unix-x86/src/Makefile-orig Tue Nov 3 12:02:51 1998
--- Fortify-1.3.0-unix-x86/src/Makefile Tue Nov 3 12:05:28 1998
*** Fortify-1.4.1-unix-x86/src/common/Makefile-orig Tue Nov 3 12:02:51 1998
--- Fortify-1.4.1-unix-x86/src/common/Makefile Tue Nov 3 12:05:28 1998
***************
*** 1,9 ****
! CC = gcc # -Wall
! CC = gcc # -Wall -ansi
# Linux and BSD systems:
# For GNU/Linux/BSD systems
! CFLAGS = -I. -O2 # -static
! YACC = bison -y
LDFLAGS = -static
LEX = lex -l
RANLIB = ranlib
--- 1,9 ----
! CC = cc # -Wall
! #CC = gcc # -Wall -ansi
# Linux and BSD systems:
# For GNU/Linux/BSD systems
! #CFLAGS = -I. -O2 # -static
! #YACC = bison -y
LDFLAGS = -static
LEX = lex -l
RANLIB = ranlib
***************
*** 31,38 ****
*** 35,42 ****
#LDFLAGS = -non_shared
#RANLIB = :
# Everything else
! #CFLAGS = -I. -O
! #YACC = yacc
#LDFLAGS = # -static
# ----------------------------------------------------------------------
--- 31,38 ----
#RANLIB = :
--- 35,42 ----
#LDFLAGS = -non_shared
#RANLIB = :
# Everything else
! CFLAGS = -I. -O2
! YACC = yacc
#LDFLAGS = # -static
# ----------------------------------------------------------------------
#RANLIB = :

View File

@ -0,0 +1,45 @@
*** Fortify-1.4.1-unix-x86/src/cmdline/Makefile-orig Tue Nov 3 12:02:51 1998
--- Fortify-1.4.1-unix-x86/src/cmdline/Makefile Tue Nov 3 12:05:28 1998
***************
*** 2,10 ****
COMMON = ../common
INC = -I. -I$(COMMON)
! CC = gcc # -Wall
# For GNU/Linux systems
! CFLAGS = $(INC) -O2 # -static
! LDFLAGS = -static
--- 2,10 ----
COMMON = ../common
INC = -I. -I$(COMMON)
! #CC = gcc # -Wall
# For GNU/Linux systems
! #CFLAGS = $(INC) -O2 # -static
! #LDFLAGS = -static
***************
*** 30,39 ****
#LDFLAGS = # -static
# Everything else
! #CFLAGS = $(INC) -O
! #LDFLAGS = # -static
# ----------------------------------------------------------------------
# You should not need to modify anything below here
#
# Everything else
--- 31,38 ----
#LDFLAGS = # -static
# Everything else
! CFLAGS = $(INC) -O2
! LDFLAGS = # -static
# ----------------------------------------------------------------------
# You should not need to modify anything below here
#

View File

@ -1,12 +1,12 @@
Netscape stand-alone Navigator 4.5 for the i386, fortified
Netscape stand-alone Navigator 4.51 for the i386, fortified
-----------------------------------------------------------
Release notes for this version of Netscape are available on-line. After
starting the program, select "Release Notes" from the "Help" menu. This
will take you to the URL
http://home.netscape.com/eng/mozilla/4.0/relnotes/unix-4.0.html
http://home.netscape.com/eng/mozilla/4.5/relnotes/unix-4.51.html
which lists new features and known problems of this release.
@ -20,4 +20,3 @@ NOTICE: Use of this port requires a kernel compiled with 'option COMPAT_BSDOS'
---
http://www.monkey.org/~dugsong/