From owner-freebsd-x11@FreeBSD.ORG Sat Apr 14 21:11:52 2007 Return-Path: X-Original-To: x11@freebsd.org Delivered-To: freebsd-x11@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3D31616A400 for ; Sat, 14 Apr 2007 21:11:52 +0000 (UTC) (envelope-from dejan.lesjak@ijs.si) Received: from mail.ijs.si (mail.ijs.si [193.2.4.66]) by mx1.freebsd.org (Postfix) with ESMTP id BB3AF13C44C for ; Sat, 14 Apr 2007 21:11:51 +0000 (UTC) (envelope-from dejan.lesjak@ijs.si) Received: from localhost (mailman.ijs.si [193.2.4.66]) by mail.ijs.si (Postfix) with ESMTP id AE31A192AF0; Sat, 14 Apr 2007 23:11:50 +0200 (CEST) DKIM-Signature: v=0.5; a=rsa-sha1; c=relaxed/simple; d=ijs.si; s=ja-200610; t=1176585110; bh=CHh0Bg5Cq3UcFAsKhwnELB1UcIg=; h=DomainKey-Signature: X-Virus-Scanned:Received:Received:Received:Received:From: Organization:To:Subject:Date:User-Agent:References:In-Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding: Content-Disposition:Message-Id; b=ctfiq3lqeR7T7A33uw4bxl2IPK20MZN/ 8XnGJEh3Uu5PFkyGesj2zDbEQo19dfbeiDwFP3EDVTO+5HLMb5vRb0V0wlzw5yoNwtK pE39kF5+ZeZdC7HuzRl+Hqs7mTb0U DomainKey-Signature: a=rsa-sha1; s=ja-200610; d=ijs.si; c=nofws; q=dns; h=x-virus-scanned:received:from:organization:to:subject:date: user-agent:references:in-reply-to:cc:mime-version:content-type: content-transfer-encoding:content-disposition:message-id; b=1gE0fT1duikICsKfLgnrUWi8Wz86HOH0nHArEM6d/lLOLAURanBNiV6pf5QtmutqS mdOgu6ALYJGwDWRp5jCqXWc9176f/HgdbbHal8hrsh8LFNpHQeUjipqQe3lNTRy X-Virus-Scanned: amavisd-new at ijs.si Received: from mail.ijs.si ([193.2.4.66]) by localhost (mail.ijs.si [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id S4dwz5WMgj7k; Sat, 14 Apr 2007 23:11:48 +0200 (CEST) Received: from edina.ijs.si (edina.ijs.si [193.2.4.3]) by mail.ijs.si (Postfix) with ESMTP id 08DA2192AEA; Sat, 14 Apr 2007 23:11:48 +0200 (CEST) Received: from radagast.ijs.si (radagast.ijs.si [193.2.4.168]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by edina.ijs.si (Postfix) with ESMTP id F19DE510B4; Sat, 14 Apr 2007 23:11:47 +0200 (CEST) Received: from localhost.ijs.si (localhost.ijs.si [127.0.0.1]) by radagast.ijs.si (8.13.8/8.13.8) with ESMTP id l3ELBlSU069506; Sat, 14 Apr 2007 23:11:47 +0200 (CEST) (envelope-from dejan.lesjak@ijs.si) From: Dejan Lesjak Organization: IJS To: Kris Kennaway Date: Sat, 14 Apr 2007 23:11:47 +0200 User-Agent: KMail/1.9.6 References: <20070414194028.GB2313@xor.obsecurity.org> <20070414195441.GA17321@xor.obsecurity.org> In-Reply-To: <20070414195441.GA17321@xor.obsecurity.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200704142311.47387.dejan.lesjak@ijs.si> Cc: x11@freebsd.org Subject: Re: Upgrade script X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 21:11:52 -0000 On Saturday 14 April 2007 21:54:41 Kris Kennaway wrote: > On Sat, Apr 14, 2007 at 03:40:28PM -0400, Kris Kennaway wrote: > > * Before spamming /usr/local there needs to be a check that no files > > will be skipped (since you are using tar -k to avoid overwriting > > existing files). Probably something using find -type f -o -type l and > > then comm(1) would be appropriate; the user should be warned about > > these conflicts and either bail out until they resolve them, or just > > proceed and let them deal with them by hand from the backup tarball. I've updated the script with this and some other stuff, it's on the same place. > On the machine I have still running xorg 6.9, I see: > > rot13# cd /usr/X11R6; find . -type f -o -type l | sort > /tmp/x > rot13# cd /usr/local; find . -type f -o -type l | sort > /tmp/l > rot13# comm -1 -2 /tmp/l /tmp/x > ./man/man3/Object.3.gz > ./man/whatis > ./share/applications/mimeinfo.cache > ./share/gnome/applications/mimeinfo.cache > ./share/mime/XMLnamespaces > ./share/mime/aliases > ./share/mime/globs > ./share/mime/magic > ./share/mime/mime.cache > ./share/mime/subclasses > > I think most of these are OK (i.e. do not need to be resolved); maybe > a whitelist of not-actually-conflicts would be useful to weed them > out. > > The first one is a real conflict though: > > rot13# ls -l /usr/X11R6/man/man3/Object.3.gz > /usr/local/man/man3/Object.3.gz -r--r--r-- 1 root wheel 1195 Sep 26 > 2006 /usr/X11R6/man/man3/Object.3.gz -r--r--r-- 1 root wheel 4850 Mar 29 > 15:41 /usr/local/man/man3/Object.3.gz rot13# pkg_which > /usr/X11R6/man/man3/Object.3.gz /usr/local/man/man3/Object.3.gz [Updating > the pkgdb in /var/db/pkg ... - 287 packages found (-0 > +1) . done] open-motif-2.2.3_2 > tcl-8.4.14_4,1 > > i.e. those ports now conflict when both in LOCALBASE. I've notified both maintainers. Thanks! Dejan