head	1.3;
access;
symbols
	RELENG_7_4_0_RELEASE:1.2.2.1
	RELENG_7_4:1.2.2.1.0.2
	RELENG_7_4_BP:1.2.2.1
	RELENG_7_3_0_RELEASE:1.2.10.1
	RELENG_7_3:1.2.0.10
	RELENG_7_3_BP:1.2
	RELENG_7_2_0_RELEASE:1.2.8.1
	RELENG_7_2:1.2.0.8
	RELENG_7_2_BP:1.2
	RELENG_7_1_0_RELEASE:1.2.6.1
	RELENG_7_1:1.2.0.6
	RELENG_7_1_BP:1.2
	RELENG_7_0_0_RELEASE:1.2
	RELENG_7_0:1.2.0.4
	RELENG_7_0_BP:1.2
	RELENG_7:1.2.0.2
	RELENG_7_BP:1.2;
locks; strict;
comment	@# @;


1.3
date	2008.09.21.13.18.25;	author simon;	state dead;
branches;
next	1.2;

1.2
date	2007.03.15.21.06.48;	author simon;	state Exp;
branches
	1.2.2.1
	1.2.6.1
	1.2.8.1
	1.2.10.1;
next	1.1;

1.1
date	2006.07.29.22.01.26;	author simon;	state Exp;
branches;
next	;

1.2.2.1
date	2010.11.28.13.45.51;	author simon;	state dead;
branches;
next	;

1.2.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.2.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.10.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.3
log
@SVN rev 183229 on 2008-09-21 13:18:25Z by simon

The vendor area is the proper home for these files now.
@
text
@
This contains various notes used to import a new OpenSSL version into
the FreeBSD base system.  It is not expected to be complete but just to
contain some hints for imports.  Note that this doesn't actually deal
with getting OpenSSL to compile...

setenv OSSLVER 0.9.8e
# OSSLTAG format: v0_9_8e
setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
fetch  http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz \
	http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc
gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz
tar xf openssl-${OSSLVER}.tar.gz
mv openssl-${OSSLVER} openssl
cd openssl
find . -type l -delete
sh -c 'while read glob ; do rm -rvf $glob ; done' </usr/src/crypto/openssl/FREEBSD-Xlist
# Check for new files
cvs -n import src/crypto/openssl OPENSSL x | grep \^N
cvs import -m "Vendor import of OpenSSL ${OSSLVER}." src/crypto/openssl OPENSSL ${OSSLTAG}
cvs checkout -j<prev_rel_tag> -j${OSSLTAG} src/crypto/openssl
# Resolve conflicts manually
cd src/crypto/openssl
cvs ci -m "Resolve conflicts after import of OpenSSL ${OSSLVER}."

cd ../../secure
# Do something so it actually compiles...
# Update version number in lib/libcrypto/Makefile.inc
cd lib/libcrypto
make man-makefile-update && make man-update
cd ../libssl
make man-makefile-update && make man-update
cd ../../usr.bin/openssl
make man-makefile-update && make man-update
cd ../..
cvs add lib/libcrypto/man/*.3 lib/libssl/man/*.3 usr.bin/openssl/man/*.1
cvs update
# check for files not added
cvs ci -m "Upgrade to OpenSSL ${OSSLVER}."

					-- simon@@

$FreeBSD: src/crypto/openssl/FREEBSD-upgrade,v 1.2 2007/03/15 21:06:48 simon Exp $
@


1.2
log
@- Bring upgrade produce up-to-date for OpenSSL 0.9.8e.
- Add reminder to bump version numer in Makefile.inc.
@
text
@d43 1
a43 1
$FreeBSD: src/crypto/openssl/FREEBSD-upgrade,v 1.1 2006/07/29 22:01:26 simon Exp $
@


1.2.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
@d43 1
a43 1
$FreeBSD: src/crypto/openssl/FREEBSD-upgrade,v 1.2 2007/03/15 21:06:48 simon Exp $
@


1.2.10.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@d43 1
a43 1
$FreeBSD$
@


1.2.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@d43 1
a43 1
$FreeBSD$
@


1.2.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@d43 1
a43 1
$FreeBSD$
@


1.1
log
@Add some rough notes on how to import a new OpenSSL version into the
FreeBSD base system.  Parts are inspired by the OpenSSH upgrade notes.
@
text
@d7 2
a8 2
setenv OSSLVER 0.9.8b
# OSSLTAG format: v0_9_8b
d28 1
d43 1
a43 1
$FreeBSD$
@

