Date: Tue, 27 Jun 2000 11:51:41 +0100 From: Brian Somers <brian@Awfulhak.org> To: "David E. O'Brien" <obrien@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, Mark Knight <markk@knigma.org> Subject: Re: cvs commit: src/contrib/isc-dhcp - Imported sources Message-ID: <200006271051.LAA03535@hak.lan.Awfulhak.org> In-Reply-To: Message from "David E. O'Brien" <obrien@FreeBSD.org> of "Mon, 26 Jun 2000 01:06:24 PDT." <200006260806.BAA85401@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Is there any reason that the server can't be imported too ?
With the client installed as part of FreeBSD, it confuses things
when the isc-dhcp? port is then installed to get the server.
I would vote for pulling the server stuff into contrib too.
> obrien 2000/06/26 01:06:24 PDT
>
> src/contrib/isc-dhcp - Imported sources
> Update of /home/ncvs/src/contrib/isc-dhcp
> In directory freefall.freebsd.org:/c/tmp/cvs-serv85299
>
> Log Message:
> Import Patchlevel 1 of the ISC 2.0 dhcp client.
>
> Status:
>
> Vendor Tag: ISC
> Release Tags: isc_dhcp_2_0_pl1
>
> U src/contrib/isc-dhcp/CHANGES
> N src/contrib/isc-dhcp/Makefile.conf
> N src/contrib/isc-dhcp/Makefile.dist
> U src/contrib/isc-dhcp/README
> U src/contrib/isc-dhcp/RELNOTES
> N src/contrib/isc-dhcp/configure
> N src/contrib/isc-dhcp/client/Makefile.dist
> U src/contrib/isc-dhcp/client/clparse.c
> U src/contrib/isc-dhcp/client/dhclient-script.8
> U src/contrib/isc-dhcp/client/dhclient.8
> C src/contrib/isc-dhcp/client/dhclient.c
> U src/contrib/isc-dhcp/client/dhclient.conf
> U src/contrib/isc-dhcp/client/dhclient.conf.5
> U src/contrib/isc-dhcp/client/dhclient.leases.5
> U src/contrib/isc-dhcp/client/scripts/freebsd
> N src/contrib/isc-dhcp/common/Makefile.dist
> U src/contrib/isc-dhcp/common/alloc.c
> U src/contrib/isc-dhcp/common/bpf.c
> U src/contrib/isc-dhcp/common/conflex.c
> U src/contrib/isc-dhcp/common/convert.c
> U src/contrib/isc-dhcp/common/dhcp-options.5
> U src/contrib/isc-dhcp/common/dispatch.c
> U src/contrib/isc-dhcp/common/errwarn.c
> U src/contrib/isc-dhcp/common/ethernet.c
> U src/contrib/isc-dhcp/common/hash.c
> U src/contrib/isc-dhcp/common/icmp.c
> U src/contrib/isc-dhcp/common/inet.c
> U src/contrib/isc-dhcp/common/inet_addr.c
> U src/contrib/isc-dhcp/common/lpf.c
> U src/contrib/isc-dhcp/common/memory.c
> U src/contrib/isc-dhcp/common/nit.c
> U src/contrib/isc-dhcp/common/options.c
> U src/contrib/isc-dhcp/common/packet.c
> U src/contrib/isc-dhcp/common/parse.c
> U src/contrib/isc-dhcp/common/print.c
> U src/contrib/isc-dhcp/common/raw.c
> U src/contrib/isc-dhcp/common/socket.c
> U src/contrib/isc-dhcp/common/tables.c
> U src/contrib/isc-dhcp/common/tr.c
> U src/contrib/isc-dhcp/common/tree.c
> U src/contrib/isc-dhcp/common/upf.c
> U src/contrib/isc-dhcp/includes/cdefs.h
> U src/contrib/isc-dhcp/includes/dhcp.h
> U src/contrib/isc-dhcp/includes/dhcpd.h
> U src/contrib/isc-dhcp/includes/dhctoken.h
> U src/contrib/isc-dhcp/includes/hash.h
> U src/contrib/isc-dhcp/includes/inet.h
> U src/contrib/isc-dhcp/includes/osdep.h
> U src/contrib/isc-dhcp/includes/site.h
> U src/contrib/isc-dhcp/includes/sysconf.h
> U src/contrib/isc-dhcp/includes/tree.h
> U src/contrib/isc-dhcp/includes/version.h
> U src/contrib/isc-dhcp/includes/cf/freebsd.h
> U src/contrib/isc-dhcp/includes/arpa/nameser.h
> U src/contrib/isc-dhcp/includes/netinet/if_ether.h
> U src/contrib/isc-dhcp/includes/netinet/ip.h
> U src/contrib/isc-dhcp/includes/netinet/ip_icmp.h
> U src/contrib/isc-dhcp/includes/netinet/udp.h
>
> 1 conflicts created by this import.
> Use the following command to help the merge:
>
> cvs checkout -jISC:yesterday -jISC src/contrib/isc-dhcp
--
Brian <brian@Awfulhak.org> <brian@[uk.]FreeBSD.org>
<http://www.Awfulhak.org>; <brian@[uk.]OpenBSD.org>
Don't _EVER_ lose your sense of humour !
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200006271051.LAA03535>