head	1.4;
access;
symbols
	RELENG_7_4_0_RELEASE:1.3.12.1
	RELENG_7_4:1.3.0.12
	RELENG_7_4_BP:1.3
	RELENG_7_3_0_RELEASE:1.3.10.1
	RELENG_7_3:1.3.0.10
	RELENG_7_3_BP:1.3
	RELENG_7_2_0_RELEASE:1.3.8.1
	RELENG_7_2:1.3.0.8
	RELENG_7_2_BP:1.3
	RELENG_7_1_0_RELEASE:1.3.6.1
	RELENG_6_4_0_RELEASE:1.1.2.1.8.1
	RELENG_7_1:1.3.0.6
	RELENG_7_1_BP:1.3
	RELENG_6_4:1.1.2.1.0.8
	RELENG_6_4_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.3
	RELENG_6_3_0_RELEASE:1.1.2.1
	RELENG_7_0:1.3.0.4
	RELENG_7_0_BP:1.3
	RELENG_6_3:1.1.2.1.0.6
	RELENG_6_3_BP:1.1.2.1
	RELENG_7:1.3.0.2
	RELENG_7_BP:1.3
	v0_5_8:1.1.1.1
	MALINEN:1.1.1
	RELENG_6_2_0_RELEASE:1.1.2.1
	RELENG_6_2:1.1.2.1.0.4
	RELENG_6_2_BP:1.1.2.1
	RELENG_6_1_0_RELEASE:1.1.2.1
	RELENG_6_1:1.1.2.1.0.2
	RELENG_6_1_BP:1.1.2.1
	RELENG_6_0_0_RELEASE:1.1
	RELENG_6_0:1.1.0.4
	RELENG_6_0_BP:1.1
	RELENG_6:1.1.0.2
	RELENG_6_BP:1.1;
locks; strict;
comment	@# @;


1.4
date	2009.03.02.02.29.17;	author sam;	state dead;
branches;
next	1.3;

1.3
date	2007.07.09.16.24.41;	author sam;	state Exp;
branches
	1.3.2.1
	1.3.6.1
	1.3.8.1
	1.3.10.1
	1.3.12.1;
next	1.2;

1.2
date	2006.03.07.05.51.52;	author sam;	state Exp;
branches;
next	1.1;

1.1
date	2005.06.05.22.36.46;	author sam;	state Exp;
branches
	1.1.1.1
	1.1.2.1;
next	;

1.3.2.1
date	2012.11.17.08.00.59;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.3.12.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.3.12.2;

1.3.12.2
date	2012.11.17.08.16.34;	author svnexp;	state Exp;
branches;
next	;

1.1.1.1
date	2007.07.09.16.14.24;	author sam;	state Exp;
branches;
next	;

1.1.2.1
date	2006.03.24.01.42.33;	author sam;	state Exp;
branches
	1.1.2.1.8.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.38.46;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.4
log
@SVN rev 189264 on 2009-03-02 02:29:17Z by sam

don't need these any more; we are now using a combined tree
@
text
@$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.3 2007/07/09 16:24:41 sam Exp $

WPA/802.1x Authenticator
	originals can be found at: http://hostap.epitest.fi/releases/


For the import files and directories were pruned by:

	tar -X FREEBSD-Xlist -zxf hostapd-0.5.8.tar.gz

then imported by:

	cvs import -m 'Import of hostapd 0.5.8' \
		src/contrib/hostapd MALINEN v0_5_8

To make local changes to hostapd, simply patch and commit to the
main branch (aka HEAD).  Never make local changes on the vendor
(MALINEN) branch.

All local changes should be submitted to Jouni Malinen for inclusion in
the next vendor release.

sam@@FreeBSD.org
7-July-2007
@


1.3
log
@update for 0.5.8 import

Approved by:	re (hrs)
@
text
@d1 1
a1 1
$FreeBSD$
@


1.3.2.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/7/contrib/hostapd/FREEBSD-upgrade 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.3.12.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.3.12.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/7.4/contrib/hostapd/FREEBSD-upgrade 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.3.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
@@


1.3.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
@@


1.3.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
@@


1.2
log
@resolve merge conflicts

MFC after:	2 weeks
@
text
@d9 1
a9 1
	tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz
d13 2
a14 2
	cvs import -m 'Import of hostapd 0.4.8' \
		src/contrib/hostapd MALINEN v0_4_8
d24 1
a24 1
6-March-2006
@


1.1
log
@import/upgrade instructions
@
text
@d9 1
a9 1
	tar -X FREEBSD-Xlist -zxf hostapd-0.3.7.tar.gz
d13 2
a14 2
	cvs import -m 'Import of hostapd 0.3.7' \
		src/contrib/hostapd MALINEN v0_3_7
d24 1
a24 1
4-June-2005
@


1.1.1.1
log
@Import of hostapd 0.5.8
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.2 2006/03/07 05:51:52 sam Exp $
d9 1
a9 1
	tar -X FREEBSD-Xlist -zxf hostapd-0.5.8.tar.gz
d13 2
a14 2
	cvs import -m 'Import of hostapd 0.5.8' \
		src/contrib/hostapd MALINEN v0_5_8
d24 1
a24 1
7-July-2007
@


1.1.2.1
log
@MFC v0.4.8 import of hostapd

Approved by:	re (hrs)
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/hostapd/FREEBSD-upgrade,v 1.2 2006/03/07 05:51:52 sam Exp $
d9 1
a9 1
	tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz
d13 2
a14 2
	cvs import -m 'Import of hostapd 0.4.8' \
		src/contrib/hostapd MALINEN v0_4_8
d24 1
a24 1
6-March-2006
@


1.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/contrib/hostapd/FREEBSD-upgrade 157075 2006-03-24 01:42:36Z sam $
@


1.1.2.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@d1 1
a1 1
$FreeBSD$
@


