From owner-cvs-src@FreeBSD.ORG Tue Jun 7 04:05:10 2005 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 E8F3B16A41C; Tue, 7 Jun 2005 04:05:09 +0000 (GMT) (envelope-from brooks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B78F643D4C; Tue, 7 Jun 2005 04:05:09 +0000 (GMT) (envelope-from brooks@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 j57459xI049511; Tue, 7 Jun 2005 04:05:09 GMT (envelope-from brooks@repoman.freebsd.org) Received: (from brooks@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j57459LA049510; Tue, 7 Jun 2005 04:05:09 GMT (envelope-from brooks) Message-Id: <200506070405.j57459LA049510@repoman.freebsd.org> From: Brooks Davis Date: Tue, 7 Jun 2005 04:05:09 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: OPENBSD Cc: Subject: cvs commit: src/sbin/dhclient - Imported sources 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 Jun 2005 04:05:10 -0000 brooks 2005-06-07 04:05:09 UTC FreeBSD src repository src/sbin/dhclient - Imported sources Update of /home/ncvs/src/sbin/dhclient In directory repoman.freebsd.org:/tmp/cvs-serv49480 Log Message: Import the OpenBSD dhclient as shipped with OpenBSD-3.7 (the tag OPENBSD_3_7). Status: Vendor Tag: OPENBSD Release Tags: dhclient_openbsd_3_7 C src/sbin/dhclient/Makefile N src/sbin/dhclient/alloc.c N src/sbin/dhclient/bpf.c N src/sbin/dhclient/clparse.c N src/sbin/dhclient/conflex.c N src/sbin/dhclient/convert.c N src/sbin/dhclient/dhclient-script N src/sbin/dhclient/dhclient-script.8 N src/sbin/dhclient/dhclient.8 N src/sbin/dhclient/dhclient.c N src/sbin/dhclient/dhclient.conf N src/sbin/dhclient/dhclient.conf.5 N src/sbin/dhclient/dhclient.leases.5 N src/sbin/dhclient/dhcp-options.5 N src/sbin/dhclient/dhcp.h N src/sbin/dhclient/dhcpd.h N src/sbin/dhclient/dhctoken.h N src/sbin/dhclient/dispatch.c N src/sbin/dhclient/errwarn.c N src/sbin/dhclient/hash.c N src/sbin/dhclient/inet.c N src/sbin/dhclient/options.c N src/sbin/dhclient/parse.c N src/sbin/dhclient/packet.c N src/sbin/dhclient/privsep.c N src/sbin/dhclient/privsep.h N src/sbin/dhclient/tables.c N src/sbin/dhclient/tree.c N src/sbin/dhclient/tree.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sbin/dhclient