Date: Sat, 14 Apr 2007 23:11:47 +0200 From: Dejan Lesjak <dejan.lesjak@ijs.si> To: Kris Kennaway <kris@obsecurity.org> Cc: x11@freebsd.org Subject: Re: Upgrade script Message-ID: <200704142311.47387.dejan.lesjak@ijs.si> In-Reply-To: <20070414195441.GA17321@xor.obsecurity.org> References: <20070414194028.GB2313@xor.obsecurity.org> <20070414195441.GA17321@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <format:bdb_btree> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704142311.47387.dejan.lesjak>