From jhein@timing.com  Wed Mar 26 00:20:41 2008
Return-Path: <jhein@timing.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87B351065673
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Mar 2008 00:20:41 +0000 (UTC)
	(envelope-from jhein@timing.com)
Received: from Daffy.timing.com (smtp.timing.com [206.168.13.218])
	by mx1.freebsd.org (Postfix) with ESMTP id 17C5D8FC25
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 26 Mar 2008 00:20:40 +0000 (UTC)
	(envelope-from jhein@timing.com)
Received: from gromit.timing.com (gromit.timing.com [206.168.13.209])
	by Daffy.timing.com (8.13.1/8.13.1) with ESMTP id m2Q0Kefc027135
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Mar 2008 18:20:40 -0600 (MDT)
	(envelope-from jhein@timing.com)
Received: from gromit.timing.com (localhost [127.0.0.1])
	by gromit.timing.com (8.14.2/8.14.2) with ESMTP id m2Q0KdXY025955;
	Tue, 25 Mar 2008 18:20:39 -0600 (MDT)
	(envelope-from jhein@gromit.timing.com)
Received: (from jhein@localhost)
	by gromit.timing.com (8.14.2/8.14.2/Submit) id m2Q0KdgX025954;
	Tue, 25 Mar 2008 18:20:39 -0600 (MDT)
	(envelope-from jhein)
Message-Id: <200803260020.m2Q0KdgX025954@gromit.timing.com>
Date: Tue, 25 Mar 2008 18:20:39 -0600 (MDT)
From: John Hein <jhein@timing.com>
Reply-To: John Hein <jhein@timing.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] usbdevs.h missing from ObsoleteFiles.inc in 6.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         122099
>Category:       misc
>Synopsis:       [patch] usbdevs.h missing from ObsoleteFiles.inc in 6.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    remko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 26 00:30:01 UTC 2008
>Closed-Date:    Fri Apr 11 10:14:38 UTC 2008
>Last-Modified:  Fri Apr 11 10:20:04 UTC 2008
>Originator:     John Hein
>Release:        FreeBSD 6
>Organization:
>Environment:


>Description:

RELENG_6 doesn't list usbdevs.h and usbdevs_data.h in ObsoleteFiles.inc
and they were remove before any 6.x was tagged.

Also the patch below better documents when they were removed from
HEAD.

It would be great if the patch could be committed, then merged
back to 6.x (and 7 for consistency).

These files are just as stale for any 6.x installation as they are for
HEAD.

>How-To-Repeat:

Use buildworld to update from an old 5.x that had usbdevs.h in
/usr/include to 6.x - note the stale usbdevs.h after 'make delete-old'

>Fix:

Index: ObsoleteFiles.inc
===================================================================
RCS file: /base/FreeBSD-CVS/src/ObsoleteFiles.inc,v
retrieving revision 1.133
diff -u -p -r1.133 ObsoleteFiles.inc
--- ObsoleteFiles.inc	13 Mar 2008 18:17:46 -0000	1.133
+++ ObsoleteFiles.inc	25 Mar 2008 23:48:07 -0000
@@ -3551,8 +3551,6 @@ OLD_FILES+=sbin/mount_reiserfs
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 OLD_FILES+=usr/include/cam/cam_extend.h
-OLD_FILES+=usr/include/dev/usb/usbdevs.h
-OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h
@@ -4341,6 +4339,9 @@ OLD_LIBS+=usr/lib/pam_ftp.so.2
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc
 OLD_DIRS+=usr/share/doc/bind/
+# 20040627: usbdevs.h removal
+OLD_FILES+=usr/include/dev/usb/usbdevs.h
+OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # ???
 OLD_DIRS+=usr/include/g++/std
 OLD_DIRS+=usr/include/msdosfs
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: remko 
State-Changed-When: Wed Mar 26 06:45:49 UTC 2008 
State-Changed-Why:  
PAtched in -current, will MFC in a few days 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122099 
Responsible-Changed-From-To: freebsd-bugs->remko 
Responsible-Changed-By: remko 
Responsible-Changed-When: Wed Mar 26 06:46:07 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122099 
State-Changed-From-To: patched->closed 
State-Changed-By: remko 
State-Changed-When: Fri Apr 11 10:14:38 UTC 2008 
State-Changed-Why:  
I have committed the fixes, thanks for the submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122099 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/122099: commit references a PR
Date: Fri, 11 Apr 2008 10:14:28 +0000 (UTC)

 remko       2008-04-11 10:14:19 UTC
 
   FreeBSD src repository
 
   Modified files:        (Branch: RELENG_6)
     .                    ObsoleteFiles.inc 
   Log:
   MFC rev 1.134 ObsoleteFiles.inc
   
     Document the removal data for usbdevs.h and usbdevs_data.h,
     sort the entry into it's correct place (behind 200407XX before
     200406XX because we have an explicit date here).
   
     PR:             misc/122098
     Submitted by:   "John Hein" <jhein@timing.com>
     MFC after:      3 days
   
   Approved by:    imp (mentor, implicit)
   PR:             misc/122099 (should have been this PR).
   
   Revision   Changes    Path
   1.25.2.23  +3 -0      src/ObsoleteFiles.inc
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
