From root@borderware.com  Thu Jul  4 15:02:44 2002
Return-Path: <root@borderware.com>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ECC4F37B400
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Jul 2002 15:02:44 -0700 (PDT)
Received: from mgateway.borderware.com (mgateway.borderware.com [207.236.65.231])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3403E43E09
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  4 Jul 2002 15:02:44 -0700 (PDT)
	(envelope-from root@borderware.com)
Message-Id: <20020704220241.F281732C@mojo.borderware.com>
Date: Thu,  4 Jul 2002 18:02:41 -0400 (EDT)
From: Steve Zweep <steve@borderware.com>
Reply-To: Steve Zweep <steve@borderware.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Building libc fails when LIBC_SCCS is defined due to rcsid string errors
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         40202
>Category:       bin
>Synopsis:       [PATCH] Building libc fails when LIBC_SCCS is defined due to rcsid string errors
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 04 15:10:01 PDT 2002
>Closed-Date:    Sun Jul 07 04:37:45 PDT 2002
>Last-Modified:  Sun Jul 07 04:37:45 PDT 2002
>Originator:     Steve Zweep
>Release:        FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD mojo.borderware.com 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #2: Mon May 13 11:14:20 EDT 2002 steve@mojo.borderware.com:/usr/obj/usr/src/sys/MOJO i386


	
>Description:
	There are two errors in rcsid strings which cause a build of libc to fail 
	if they are included. The strings are included only if LIBC_SCCS is defined.
	(and this is not defined by default).

	The offending files are: lib/libc/net/res_query.c and lib/libc/net/getnetbyht.c.
	Only res_query.c has the problem in -CURRENT, both do in -STABLE.
	

>How-To-Repeat:
	add -DLIBC_SCCS to /etc/make.conf and make buildworld
>Fix:
	The following are patches to the latest RELENG_4 versions of these files.

Patch for getnetbyht.c (v1.7)

--- getnetbyht.c.orig	Thu Jul  4 17:46:42 2002
+++ getnetbyht.c	Thu Jul  4 17:46:45 2002
@@ -44,7 +44,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
 static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-static chat rcsid[] = "$FreeBSD: src/lib/libc/net/getnetbyht.c,v 1.7 1999/08/28 00:00:07 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/libc/net/getnetbyht.c,v 1.7 1999/08/28 00:00:07 peter Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>




Patch for res_query.c (v1.19.2.1)

--- res_query.c.orig	Thu Jul  4 17:11:55 2002
+++ res_query.c	Thu Jul  4 17:12:21 2002
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
+static char orig_rcsid[] = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
 static char rcsid[] = "$FreeBSD: src/lib/libc/net/res_query.c,v 1.19.2.1 2001/06/15 22:08:28 ume Exp $";
 #endif /* LIBC_SCCS and not lint */
 


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: robert 
State-Changed-When: Sun Jul 7 04:37:02 PDT 2002 
State-Changed-Why:  
Fixed in both -current and -stable.  Thanks for reporting 
the breakage! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=40202 
>Unformatted:
