Date: Sat, 14 Apr 2007 15:54:41 -0400 From: Kris Kennaway <kris@obsecurity.org> To: Kris Kennaway <kris@obsecurity.org> Cc: lesi@FreeBSD.org, x11@FreeBSD.org Subject: Re: Upgrade script Message-ID: <20070414195441.GA17321@xor.obsecurity.org> In-Reply-To: <20070414194028.GB2313@xor.obsecurity.org> References: <20070414194028.GB2313@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--k1lZvvs/B4yU6o8G Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. 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. Kris --k1lZvvs/B4yU6o8G Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFGITGAWry0BWjoQKURAjf9AJ9Y9pbBNkHjWYCZiWeeUpmS+qAuXwCfdNcg nqZTBtlSGikGPgS8oB0AoAA= =K1UJ -----END PGP SIGNATURE----- --k1lZvvs/B4yU6o8G--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070414195441.GA17321>