From owner-cvs-src@FreeBSD.ORG Tue Mar 7 05:51:53 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5EC4D16A420; Tue, 7 Mar 2006 05:51:53 +0000 (GMT) (envelope-from sam@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29D2243D46; Tue, 7 Mar 2006 05:51:53 +0000 (GMT) (envelope-from sam@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k275proO045734; Tue, 7 Mar 2006 05:51:53 GMT (envelope-from sam@repoman.freebsd.org) Received: (from sam@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k275prTN045733; Tue, 7 Mar 2006 05:51:53 GMT (envelope-from sam) Message-Id: <200603070551.k275prTN045733@repoman.freebsd.org> From: Sam Leffler Date: Tue, 7 Mar 2006 05:51:53 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/contrib/hostapd FREEBSD-Xlist FREEBSD-upgrade eap.c eap.h eapol_sm.c hostapd_ctrl.c hostapd_ctrl.h ieee802_1x.c ieee802_1x.h wpa.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Mar 2006 05:51:53 -0000 sam 2006-03-07 05:51:53 UTC FreeBSD src repository Modified files: contrib/hostapd FREEBSD-Xlist FREEBSD-upgrade eap.c eap.h eapol_sm.c ieee802_1x.c ieee802_1x.h wpa.c Removed files: contrib/hostapd hostapd_ctrl.c hostapd_ctrl.h Log: resolve merge conflicts MFC after: 2 weeks Revision Changes Path 1.2 +3 -1 src/contrib/hostapd/FREEBSD-Xlist 1.2 +4 -4 src/contrib/hostapd/FREEBSD-upgrade 1.3 +26 -1 src/contrib/hostapd/eap.c 1.3 +4 -3 src/contrib/hostapd/eap.h 1.4 +113 -45 src/contrib/hostapd/eapol_sm.c 1.2 +0 -188 src/contrib/hostapd/hostapd_ctrl.c (dead) 1.2 +0 -18 src/contrib/hostapd/hostapd_ctrl.h (dead) 1.4 +162 -57 src/contrib/hostapd/ieee802_1x.c 1.3 +10 -8 src/contrib/hostapd/ieee802_1x.h 1.4 +96 -14 src/contrib/hostapd/wpa.c