From owner-cvs-all@FreeBSD.ORG  Tue Mar 25 11:31:17 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A1411065670;
	Tue, 25 Mar 2008 11:31:17 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 280D68FC36;
	Tue, 25 Mar 2008 11:31:17 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2PBVHVh052952;
	Tue, 25 Mar 2008 11:31:17 GMT
	(envelope-from cperciva@repoman.freebsd.org)
Received: (from cperciva@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2PBVHcC052951;
	Tue, 25 Mar 2008 11:31:17 GMT (envelope-from cperciva)
Message-Id: <200803251131.m2PBVHcC052951@repoman.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 25 Mar 2008 11:31:17 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/usr.sbin/freebsd-update freebsd-update.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Mar 2008 11:31:17 -0000

cperciva    2008-03-25 11:31:16 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/freebsd-update freebsd-update.sh 
  Log:
  Adjust recognize-shared-libraries regex to avoid matching symlinks to
  shared libraries.
  
  This fixes a problem which resulted in 6.x->7.x upgrades having the
  /usr/lib/libpthread.so -> libthr.so symlink missing; what happened was
  that the old libpthread.so symlink pointed to /lib/libpthread.so.2 --
  which matched the "/lib/*\.so\.[0-9]+" regex -- but the new symlink
  didn't, so FreeBSD Update got confused and deleted the symlink as part
  of its "remove old shared libraries" step.
  
  To recreate the symlink (which I understand is necessary for ports like
  KDE to build) on a 7.x system which FreeBSD Update upgraded from 6.x:
  # ln -s libthr.so /usr/lib/libpthread.so
  
  Reported by:    Dmitry RCL Rekman
  Help diagnosing bug from:       kris
  MFC after:      7 days
  
  Revision  Changes    Path
  1.14      +14 -14    src/usr.sbin/freebsd-update/freebsd-update.sh