head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_9_1_0_RELEASE:1.3
	RELENG_9_1:1.3.0.6
	RELENG_9_1_BP:1.3
	RELENG_8_3_0_RELEASE:1.2.2.1
	RELENG_8_3:1.2.2.1.0.6
	RELENG_8_3_BP:1.2.2.1
	RELENG_9_0_0_RELEASE:1.3
	RELENG_9_0:1.3.0.4
	RELENG_9_0_BP:1.3
	RELENG_9:1.3.0.2
	RELENG_9_BP:1.3
	RELENG_7_4_0_RELEASE:1.1.1.6.2.1
	RELENG_8_2_0_RELEASE:1.2.2.1
	RELENG_7_4:1.1.1.6.2.1.0.2
	RELENG_7_4_BP:1.1.1.6.2.1
	RELENG_8_2:1.2.2.1.0.4
	RELENG_8_2_BP:1.2.2.1
	RELENG_8_1_0_RELEASE:1.2.2.1
	RELENG_8_1:1.2.2.1.0.2
	RELENG_8_1_BP:1.2.2.1
	RELENG_7_3_0_RELEASE:1.1.1.6
	RELENG_7_3:1.1.1.6.0.10
	RELENG_7_3_BP:1.1.1.6
	RELENG_8_0_0_RELEASE:1.2
	RELENG_8_0:1.2.0.4
	RELENG_8_0_BP:1.2
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.1.1.6
	RELENG_7_2:1.1.1.6.0.8
	RELENG_7_2_BP:1.1.1.6
	RELENG_7_1_0_RELEASE:1.1.1.6
	RELENG_6_4_0_RELEASE:1.1.1.5
	RELENG_7_1:1.1.1.6.0.6
	RELENG_7_1_BP:1.1.1.6
	RELENG_6_4:1.1.1.5.0.12
	RELENG_6_4_BP:1.1.1.5
	RELENG_7_0_0_RELEASE:1.1.1.6
	RELENG_6_3_0_RELEASE:1.1.1.5
	RELENG_7_0:1.1.1.6.0.4
	RELENG_7_0_BP:1.1.1.6
	RELENG_6_3:1.1.1.5.0.10
	RELENG_6_3_BP:1.1.1.5
	RELENG_7:1.1.1.6.0.2
	RELENG_7_BP:1.1.1.6
	v0_9_8e:1.1.1.6
	RELENG_6_2_0_RELEASE:1.1.1.5
	RELENG_6_2:1.1.1.5.0.8
	RELENG_6_2_BP:1.1.1.5
	v0_9_8d:1.1.1.6
	v0_9_8b:1.1.1.6
	RELENG_5_5_0_RELEASE:1.1.1.4.6.1
	RELENG_5_5:1.1.1.4.6.1.0.4
	RELENG_5_5_BP:1.1.1.4.6.1
	RELENG_6_1_0_RELEASE:1.1.1.5
	RELENG_6_1:1.1.1.5.0.6
	RELENG_6_1_BP:1.1.1.5
	RELENG_6_0_0_RELEASE:1.1.1.5
	RELENG_6_0:1.1.1.5.0.4
	RELENG_6_0_BP:1.1.1.5
	RELENG_6:1.1.1.5.0.2
	RELENG_6_BP:1.1.1.5
	RELENG_5_4_0_RELEASE:1.1.1.4.6.1
	RELENG_5_4:1.1.1.4.6.1.0.2
	RELENG_5_4_BP:1.1.1.4.6.1
	v0_9_7e:1.1.1.5
	RELENG_4_11_0_RELEASE:1.1.1.1.2.3
	RELENG_4_11:1.1.1.1.2.3.0.8
	RELENG_4_11_BP:1.1.1.1.2.3
	RELENG_5_3_0_RELEASE:1.1.1.4
	RELENG_5_3:1.1.1.4.0.8
	RELENG_5_3_BP:1.1.1.4
	RELENG_5:1.1.1.4.0.6
	RELENG_5_BP:1.1.1.4
	RELENG_4_10_0_RELEASE:1.1.1.1.2.3
	RELENG_4_10:1.1.1.1.2.3.0.6
	RELENG_4_10_BP:1.1.1.1.2.3
	v0_9_7d:1.1.1.4
	RELENG_5_2_1_RELEASE:1.1.1.4
	RELENG_5_2_0_RELEASE:1.1.1.4
	RELENG_5_2:1.1.1.4.0.4
	RELENG_5_2_BP:1.1.1.4
	RELENG_4_9_0_RELEASE:1.1.1.1.2.3
	RELENG_4_9:1.1.1.1.2.3.0.4
	RELENG_4_9_BP:1.1.1.1.2.3
	v0_9_7c:1.1.1.4
	RELENG_5_1_0_RELEASE:1.1.1.4
	RELENG_5_1:1.1.1.4.0.2
	RELENG_5_1_BP:1.1.1.4
	RELENG_4_8_0_RELEASE:1.1.1.1.2.3
	RELENG_4_8:1.1.1.1.2.3.0.2
	RELENG_4_8_BP:1.1.1.1.2.3
	v0_9_7a:1.1.1.4
	v0_9_7:1.1.1.4
	RELENG_5_0_0_RELEASE:1.1.1.3
	RELENG_5_0:1.1.1.3.0.2
	RELENG_5_0_BP:1.1.1.3
	RELENG_4_7_0_RELEASE:1.1.1.1.2.2
	RELENG_4_7:1.1.1.1.2.2.0.2
	RELENG_4_7_BP:1.1.1.1.2.2
	RELENG_4_6_2_RELEASE:1.1.1.1.2.1.8.1
	v0_9_6g:1.1.1.3
	v0_9_6f:1.1.1.3
	v0_9_6e:1.1.1.3
	v0_9_6d:1.1.1.2
	RELENG_4_6_1_RELEASE:1.1.1.1.2.1
	RELENG_4_6_0_RELEASE:1.1.1.1.2.1
	RELENG_4_6:1.1.1.1.2.1.0.8
	RELENG_4_6_BP:1.1.1.1.2.1
	RELENG_4_5_0_RELEASE:1.1.1.1.2.1
	v0_9_6c:1.1.1.2
	RELENG_4_5:1.1.1.1.2.1.0.6
	RELENG_4_5_BP:1.1.1.1.2.1
	RELENG_4_4_0_RELEASE:1.1.1.1.2.1
	RELENG_4_4:1.1.1.1.2.1.0.4
	RELENG_4_4_BP:1.1.1.1.2.1
	v0_9_6b:1.1.1.2
	v0_9_6a:1.1.1.2
	RELENG_4_3_0_RELEASE:1.1.1.1.2.1
	RELENG_4_3:1.1.1.1.2.1.0.2
	RELENG_4_3_BP:1.1.1.1.2.1
	v0_9_6_2001_02_10:1.1.1.2
	RELENG_4_2_0_RELEASE:1.1.1.1.2.1
	v0_9_6:1.1.1.2
	RELENG_4_1_1_RELEASE:1.1.1.1.2.1
	PRE_SMPNG:1.1.1.2
	RELENG_4_1_0_RELEASE:1.1.1.1
	v0_9_5a:1.1.1.2
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v0_9_4:1.1.1.1
	OPENSSL:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2012.07.12.19.30.53;	author jkim;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2010.03.13.19.22.41;	author simon;	state Exp;
branches;
next	1.2;

1.2
date	2009.06.14.19.45.16;	author simon;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2000.01.10.06.22.05;	author kris;	state Exp;
branches
	1.1.1.1;
next	;

1.4.2.1
date	2012.07.12.19.30.53;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.02.41;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2010.05.22.18.40.54;	author simon;	state Exp;
branches;
next	;

1.1.1.1
date	2000.01.10.06.22.05;	author kris;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2000.04.13.06.33.05;	author kris;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2002.07.30.13.38.05;	author nectar;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2003.01.28.21.42.36;	author markm;	state Exp;
branches
	1.1.1.4.6.1;
next	1.1.1.5;

1.1.1.5
date	2005.02.25.05.38.52;	author nectar;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2006.07.29.19.10.21;	author simon;	state Exp;
branches
	1.1.1.6.2.1;
next	;

1.1.1.1.2.1
date	2000.08.20.08.47.06;	author kris;	state Exp;
branches
	1.1.1.1.2.1.4.1
	1.1.1.1.2.1.6.1
	1.1.1.1.2.1.8.1;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2002.07.30.22.06.08;	author nectar;	state Exp;
branches;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2003.02.14.22.38.12;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.1.4.1
date	2002.07.31.16.41.25;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.1.6.1
date	2002.07.31.14.05.32;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.1.8.1
date	2002.07.31.02.55.10;	author nectar;	state Exp;
branches;
next	;

1.1.1.4.6.1
date	2005.03.01.16.47.37;	author nectar;	state Exp;
branches;
next	;

1.1.1.6.2.1
date	2010.11.28.13.45.51;	author simon;	state Exp;
branches;
next	;


desc
@@


1.4
log
@SVN rev 238405 on 2012-07-12 19:30:53Z by jkim

Merge OpenSSL 1.0.1c.

Approved by:	benl (maintainer)
@
text
@#!/bin/sh
# Do a makedepend, only leave out the standard headers
# Written by Ben Laurie <ben@@algroup.co.uk> 19 Jan 1999

TOP=$1
shift
if [ "$1" = "-MD" ]; then
    shift
    MAKEDEPEND=$1
    shift
fi
if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi

cp Makefile Makefile.save
# fake the presence of Kerberos
touch $TOP/krb5.h
if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
    args=""
    while [ $# -gt 0 ]; do
	if [ "$1" != "--" ]; then args="$args $1"; fi
	shift
    done
    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
    ${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp || exit 1
    ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
    RC=$?
    rm -f Makefile.tmp
else
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@@ && \
    ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
    RC=$?
fi
mv Makefile.new Makefile
# unfake the presence of Kerberos
rm $TOP/krb5.h

exit $RC
@


1.4.2.1
log
@file domd was added on branch RELENG_8_4 on 2013-03-28 13:02:41 +0000
@
text
@d1 38
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 34
#!/bin/sh
# Do a makedepend, only leave out the standard headers
# Written by Ben Laurie <ben@@algroup.co.uk> 19 Jan 1999

TOP=$1
shift
if [ "$1" = "-MD" ]; then
    shift
    MAKEDEPEND=$1
    shift
fi
if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi

cp Makefile Makefile.save
# fake the presence of Kerberos
touch $TOP/krb5.h
if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
    args=""
    while [ $# -gt 0 ]; do
	if [ "$1" != "--" ]; then args="$args $1"; fi
	shift
    done
    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
    ${CC:-gcc} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
    ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
    rm -f Makefile.tmp
else
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@@
    ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
fi
mv Makefile.new Makefile
# unfake the presence of Kerberos
rm $TOP/krb5.h
@


1.3
log
@SVN rev 205128 on 2010-03-13 19:22:41Z by simon

Merge OpenSSL 0.9.8m into head.

This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL.  The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.

MFC after:	3 weeks
@
text
@d25 1
a25 1
    ${CC:-gcc} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
d27 1
d30 1
a30 1
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@@
d32 1
d37 2
@


1.2
log
@SVN rev 194206 on 2009-06-14 19:45:16Z by simon

Merge OpenSSL 0.9.8k into head.

Approved by:	re
@
text
@d17 1
a17 1
if [ "$MAKEDEPEND" = "gcc" ]; then
@


1.2.2.1
log
@SVN rev 208419 on 2010-05-22 18:40:54Z by simon

Merge OpenSSL 0.9.8n from head into stable/8.

Approved by:	re (kib)
@
text
@d17 1
a17 1
if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
@


1.1
log
@Initial revision
@
text
@d7 6
d14 21
a34 4
cp Makefile.ssl Makefile.save
makedepend -f Makefile.ssl $@@
$TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
mv Makefile.new Makefile.ssl
@


1.1.1.1
log
@Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.
@
text
@@


1.1.1.1.2.1
log
@MFC: OpenSSL 0.9.5a
@
text
@d10 1
a10 1
perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
@


1.1.1.1.2.1.4.1
log
@MFC: OpenSSL 0.9.6e
@
text
@d10 1
a10 1
${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
@


1.1.1.1.2.1.6.1
log
@MFC: OpenSSL 0.9.6e
@
text
@d10 1
a10 1
${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
@


1.1.1.1.2.1.8.1
log
@MFC: OpenSSL 0.9.6e
@
text
@d10 1
a10 1
${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
@


1.1.1.1.2.2
log
@MFC: OpenSSL 0.9.6e
@
text
@d10 1
a10 1
${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
@


1.1.1.1.2.3
log
@MFC OpenSSL 0.9.7
@
text
@a6 6
if [ "$1" = "-MD" ]; then
    shift
    MAKEDEPEND=$1
    shift
fi
if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
d9 2
a10 17
# fake the presence of Kerberos
touch $TOP/krb5.h
if [ "$MAKEDEPEND" = "gcc" ]; then
    args=""
    while [ $# -gt 0 ]; do
	if [ "$1" != "--" ]; then args="$args $1"; fi
	shift
    done
    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
    gcc -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
    ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
    rm -f Makefile.tmp
else
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@@
    ${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
fi
a11 2
# unfake the presence of Kerberos
rm $TOP/krb5.h
@


1.1.1.2
log
@Initial import of OpenSSL 0.9.5a
@
text
@d10 1
a10 1
perl $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
@


1.1.1.3
log
@Import of OpenSSL 0.9.6e.
@
text
@d10 1
a10 1
${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
@


1.1.1.4
log
@Vendor import of OpenSSL release 0.9.7. This release includes
support for AES and OpenBSD's hardware crypto.
@
text
@a6 6
if [ "$1" = "-MD" ]; then
    shift
    MAKEDEPEND=$1
    shift
fi
if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
d9 2
a10 17
# fake the presence of Kerberos
touch $TOP/krb5.h
if [ "$MAKEDEPEND" = "gcc" ]; then
    args=""
    while [ $# -gt 0 ]; do
	if [ "$1" != "--" ]; then args="$args $1"; fi
	shift
    done
    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile.ssl > Makefile.tmp
    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp
    gcc -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
    ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new
    rm -f Makefile.tmp
else
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile.ssl $@@
    ${PERL} $TOP/util/clean-depend.pl < Makefile.ssl > Makefile.new
fi
a11 2
# unfake the presence of Kerberos
rm $TOP/krb5.h
@


1.1.1.4.6.1
log
@MFC update OpenSSL 0.9.7d -> 0.9.7e.
@
text
@d14 1
a14 1
cp Makefile Makefile.save
d23 1
a23 1
    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
d29 2
a30 2
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile $@@
    ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
d32 1
a32 1
mv Makefile.new Makefile
@


1.1.1.5
log
@Vendor import of OpenSSL 0.9.7e.
@
text
@d14 1
a14 1
cp Makefile Makefile.save
d23 1
a23 1
    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp
d29 2
a30 2
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -f Makefile $@@
    ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new
d32 1
a32 1
mv Makefile.new Makefile
@


1.1.1.6
log
@Vendor import of OpenSSL 0.9.8b
@
text
@d29 1
a29 1
    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@@
@


1.1.1.6.2.1
log
@SVN rev 215997 on 2010-11-28 13:45:51Z by simon

Merge OpenSSL 0.9.8p into stable/7.

This merges up to and including head/crypto/openssl/ r215697; and
head/secure/lib/libcrypto/, head/secure/lib/libssl/,
head/secure/usr.bin/openssl/ r215698.

To make the merge simpler, a hack was added to set MACHINE_CPUARCH.

A few old OpenSSL security fixes are still the stable/7 tree - these
will be backed out to the vendor version shortly.

Security:	CVE-2010-2939, CVE-2010-3864
Security:	http://www.openssl.org/news/secadv_20101116.txt
Security:	FreeBSD-SA-10:10.openssl
Approved by:	re (implicitly - they did not object of the general idea
		of OpenSSL update)
@
text
@d17 1
a17 1
if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then
d25 1
a25 1
    ${CC:-gcc} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp
@


