Date: Wed, 3 Apr 2002 18:32:09 +0200 From: Andrea Campi <andrea@webcom.it> To: Murray Stokely <murray@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/isc-dhcp - Imported sources Message-ID: <20020403163209.GA14866@webcom.it> In-Reply-To: <200204010754.g317smi53702@freefall.freebsd.org> References: <200204010754.g317smi53702@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Mar 31, 2002 at 11:54:48PM -0800, Murray Stokely wrote:
> murray 2002/03/31 23:54:48 PST
>
> src/contrib/isc-dhcp - Imported sources
> Update of /home/ncvs/src/contrib/isc-dhcp
> In directory freefall.freebsd.org:/c/tmp/cvs-serv53686
>
> Log Message:
> Import ISC DHCP 3.0.1 RC8 client.
>
This commit broke world, as you probably forgot to resolve conflicts on
ns_parse.c, which is off the vendor branch. Sorry I can't report the proper
error, but I can tell you I solved it with a simple:
cvs update -r1.1.1.2 ns_parse.c
Also, the sed trick we do on ns_parse.c is no longer needed.
Bye,
Andrea
> Status:
>
> Vendor Tag: ISC
> Release Tags: isc_dhcp_3_0_1_rc8
>
> U src/contrib/isc-dhcp/ANONCVS
> U src/contrib/isc-dhcp/CHANGES
> U src/contrib/isc-dhcp/COPYRIGHT
> U src/contrib/isc-dhcp/Makefile
> U src/contrib/isc-dhcp/Makefile.conf
> U src/contrib/isc-dhcp/Makefile.dist
> U src/contrib/isc-dhcp/README
> U src/contrib/isc-dhcp/RELNOTES
> U src/contrib/isc-dhcp/configure
> U src/contrib/isc-dhcp/site.conf
> U src/contrib/isc-dhcp/client/Makefile.dist
> C src/contrib/isc-dhcp/client/clparse.c
> U src/contrib/isc-dhcp/client/dhclient-script.8
> C src/contrib/isc-dhcp/client/dhclient.8
> C src/contrib/isc-dhcp/client/dhclient.c
> U src/contrib/isc-dhcp/client/dhclient.conf
> C src/contrib/isc-dhcp/client/dhclient.conf.5
> U src/contrib/isc-dhcp/client/dhclient.leases.5
> C src/contrib/isc-dhcp/client/scripts/freebsd
> U src/contrib/isc-dhcp/common/dlpi.c
> U 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/comapi.c
> U src/contrib/isc-dhcp/common/conflex.c
> U src/contrib/isc-dhcp/common/ctrace.c
> U src/contrib/isc-dhcp/common/dhcp-eval.5
> C src/contrib/isc-dhcp/common/dhcp-options.5
> U src/contrib/isc-dhcp/common/discover.c
> U src/contrib/isc-dhcp/common/dispatch.c
> U src/contrib/isc-dhcp/common/dns.c
> U src/contrib/isc-dhcp/common/ethernet.c
> U src/contrib/isc-dhcp/common/execute.c
> U src/contrib/isc-dhcp/common/fddi.c
> U src/contrib/isc-dhcp/common/icmp.c
> U src/contrib/isc-dhcp/common/inet.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/tr.c
> U src/contrib/isc-dhcp/common/resolv.c
> U src/contrib/isc-dhcp/common/socket.c
> C src/contrib/isc-dhcp/common/tables.c
> U src/contrib/isc-dhcp/common/tree.c
> U src/contrib/isc-dhcp/common/upf.c
> U src/contrib/isc-dhcp/contrib/3.0b1-lease-convert
> U src/contrib/isc-dhcp/contrib/sethostname.sh
> U src/contrib/isc-dhcp/dst/Makefile.dist
> U src/contrib/isc-dhcp/dst/base64.c
> U src/contrib/isc-dhcp/dst/dst_api.c
> U src/contrib/isc-dhcp/dst/dst_internal.h
> U src/contrib/isc-dhcp/dst/dst_support.c
> U src/contrib/isc-dhcp/dst/hmac_link.c
> U src/contrib/isc-dhcp/dst/md5.h
> U src/contrib/isc-dhcp/dst/md5_dgst.c
> U src/contrib/isc-dhcp/dst/md5_locl.h
> U src/contrib/isc-dhcp/dst/prandom.c
> U src/contrib/isc-dhcp/includes/cdefs.h
> U src/contrib/isc-dhcp/includes/ctrace.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/failover.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/statement.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/arpa/nameser_compat.h
> U src/contrib/isc-dhcp/includes/isc-dhcp/boolean.h
> U src/contrib/isc-dhcp/includes/isc-dhcp/dst.h
> U src/contrib/isc-dhcp/includes/isc-dhcp/int.h
> U src/contrib/isc-dhcp/includes/isc-dhcp/lang.h
> U src/contrib/isc-dhcp/includes/isc-dhcp/list.h
> U src/contrib/isc-dhcp/includes/isc-dhcp/result.h
> U src/contrib/isc-dhcp/includes/isc-dhcp/types.h
> U src/contrib/isc-dhcp/includes/minires/minires.h
> U src/contrib/isc-dhcp/includes/minires/res_update.h
> U src/contrib/isc-dhcp/includes/minires/resolv.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
> U src/contrib/isc-dhcp/includes/omapip/alloc.h
> U src/contrib/isc-dhcp/includes/omapip/buffer.h
> U src/contrib/isc-dhcp/includes/omapip/convert.h
> U src/contrib/isc-dhcp/includes/omapip/hash.h
> U src/contrib/isc-dhcp/includes/omapip/omapip.h
> U src/contrib/isc-dhcp/includes/omapip/omapip_p.h
> U src/contrib/isc-dhcp/includes/omapip/trace.h
> U src/contrib/isc-dhcp/minires/Makefile.dist
> U src/contrib/isc-dhcp/minires/ns_date.c
> U src/contrib/isc-dhcp/minires/ns_name.c
> U src/contrib/isc-dhcp/minires/ns_parse.c
> U src/contrib/isc-dhcp/minires/ns_samedomain.c
> U src/contrib/isc-dhcp/minires/ns_sign.c
> U src/contrib/isc-dhcp/minires/ns_verify.c
> U src/contrib/isc-dhcp/minires/res_comp.c
> U src/contrib/isc-dhcp/minires/res_findzonecut.c
> U src/contrib/isc-dhcp/minires/res_init.c
> U src/contrib/isc-dhcp/minires/res_mkquery.c
> U src/contrib/isc-dhcp/minires/res_mkupdate.c
> U src/contrib/isc-dhcp/minires/res_query.c
> U src/contrib/isc-dhcp/minires/res_send.c
> U src/contrib/isc-dhcp/minires/res_sendsigned.c
> U src/contrib/isc-dhcp/minires/res_update.c
> U src/contrib/isc-dhcp/omapip/Makefile.dist
> U src/contrib/isc-dhcp/omapip/alloc.c
> U src/contrib/isc-dhcp/omapip/array.c
> U src/contrib/isc-dhcp/omapip/auth.c
> U src/contrib/isc-dhcp/omapip/buffer.c
> U src/contrib/isc-dhcp/omapip/connection.c
> U src/contrib/isc-dhcp/omapip/convert.c
> U src/contrib/isc-dhcp/omapip/dispatch.c
> U src/contrib/isc-dhcp/omapip/errwarn.c
> U src/contrib/isc-dhcp/omapip/generic.c
> U src/contrib/isc-dhcp/omapip/handle.c
> U src/contrib/isc-dhcp/omapip/hash.c
> U src/contrib/isc-dhcp/omapip/inet_addr.c
> U src/contrib/isc-dhcp/omapip/listener.c
> U src/contrib/isc-dhcp/omapip/message.c
> U src/contrib/isc-dhcp/omapip/mrtrace.c
> U src/contrib/isc-dhcp/omapip/omapi.3
> U src/contrib/isc-dhcp/omapip/protocol.c
> U src/contrib/isc-dhcp/omapip/result.c
> U src/contrib/isc-dhcp/omapip/support.c
> U src/contrib/isc-dhcp/omapip/test.c
> U src/contrib/isc-dhcp/omapip/toisc.c
> U src/contrib/isc-dhcp/omapip/trace.c
> U src/contrib/isc-dhcp/tests/failover/dhcp-1.cf
> U src/contrib/isc-dhcp/tests/failover/dhcp-2.cf
> U src/contrib/isc-dhcp/tests/failover/new-failover
>
> 7 conflicts created by this import.
> Use the following command to help the merge:
>
> cvs checkout -jISC:yesterday -jISC src/contrib/isc-dhcp
>
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe cvs-all" in the body of the message
--
It's not a bug, it's tradition!
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?20020403163209.GA14866>