Date: Sat, 14 Apr 2007 22:13:00 -0400 From: Kris Kennaway <kris@obsecurity.org> To: Dejan Lesjak <dejan.lesjak@ijs.si> Cc: lesi@freebsd.org, x11@freebsd.org, Kris Kennaway <kris@obsecurity.org> Subject: Re: Upgrade script Message-ID: <20070415021300.GA77534@xor.obsecurity.org> In-Reply-To: <200704150400.54127.dejan.lesjak@ijs.si> References: <20070414194028.GB2313@xor.obsecurity.org> <20070414195441.GA17321@xor.obsecurity.org> <20070415012035.GA32022@xor.obsecurity.org> <200704150400.54127.dejan.lesjak@ijs.si>
next in thread | previous in thread | raw e-mail | index | archive | help
--pWyiEgJYm5f9v55/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Apr 15, 2007 at 04:00:53AM +0200, Dejan Lesjak wrote:
> On Sunday 15 April 2007 03:20:35 Kris Kennaway wrote:
> > Actually this script is not doing enough: the problem is that even
> > after all the portrevisions will be bumped, a portupgrade -a will not
> > install most of the new xorg packages, and the user will be left with
> > a non-working hybrid (I guess no-one actually tested the upgrade part
> > yet :-).
>=20
> Erm, yes it was, a couple of times in vmware - fresh install of xorg,=20
> windowmaker, xine (as they both go in X11BASE). All the xorg 7.2 libs por=
ts=20
> were installed.
>=20
> > i.e. when xorg-libraries is upgraded from 6.9 to 7.2, most of the
> > dependency checks for things that now live in sub-packages will pass
> > (since they look for files also installed by xorg 6.9), so most of the
> > new ports won't be installed.
>=20
> They shouldn't just pass. xorg-libraries meta-port is looking for .pc fil=
es=20
> for dependencies, not libraries, for exactly this purpose. Also the=20
> dependecies are under RUN_DEPENDS so portupgrade installs them after remo=
ving=20
> old version of xorg-libraries (ie it does equivalent of (cd portdir && ma=
ke=20
> build && make deinstall && make install)), at least it did so the last ti=
me I=20
> upgraded.
OK, it looks like you are right - sorry for implying you hadnt tested
it. However::
> > I confirmed this on an attempted=20
> > upgrade of an xorg 6.9 machine.
>=20
> What was missing from 7.2?
libXau failed, followed by:
** Listing the failed packages (*:skipped / !:failed)
! x11/xorg-libraries (xorg-libraries-6.9.0_1) (Failed to rewrite =
/var/db/pkg/xorg-libraries-6.9.0_1/+CONTENTS: No such file or directory - /=
var/db/
pkg/xorg-libraries-6.9.0_1/+CONTENTS)
! x11-servers/xorg-server (xorg-server-6.9.0_6) (X libraries missin=
g)
! x11-toolkits/open-motif (open-motif-2.2.3_2) (X libraries missin=
g)
! graphics/libglut (libglut-6.4.2) (X libraries missing)
! x11-toolkits/qt33 (qt-copy-3.3.8) (X libraries missing)
! x11-servers/xorg-printserver (xorg-printserver-6.9.0_2) (X =
libraries missing)
! print/ghostscript-afpl (ghostscript-afpl-8.54_2,1) (checksum m=
ismatch)
! x11-servers/xorg-nestserver (xorg-nestserver-6.9.0_1) (X librarie=
s missing)
! graphics/dri (dri-6.4.1,2) (X libraries missing)
! misc/gnome-mime-data (gnome-mime-data-2.4.3) (uninstall error)
! x11-fonts/xfs (xorg-fontserver-6.9.0_1) (X libraries missin=
g)
! x11-servers/xorg-vfbserver (xorg-vfbserver-6.9.0_2) (X librarie=
s missing)
! x11/xorg-apps (xorg-clients-6.9.0_3) (uninstall error)
! x11-toolkits/pango (pango-1.16.1) (X libraries missing)
! multimedia/gstreamer80 (gstreamer80-0.8.12_2) (X libraries missin=
g)
! x11-toolkits/tk84 (tk-8.4.14_4,2) (X libraries missing)
! sysutils/hal (hal-0.5.8.20070324) (uninstall error)
=3D=3D=3D> libXft-2.1.12 depends on executable in : fc-cache - found
=3D=3D=3D> libXft-2.1.12 depends on file: /usr/local/libdata/pkgconfig/xp=
roto.pc - found
=3D=3D=3D> libXft-2.1.12 depends on file: /usr/local/libdata/pkgconfig/xr=
ender.pc - found
=3D=3D=3D> libXft-2.1.12 depends on executable in : pkg-config - found
=3D=3D=3D> libXft-2.1.12 depends on shared library: freetype.9 - found
=3D=3D=3D> Building for libXau-1.0.3_2
rm -f XauFileName.3 XauReadAuth.3 XauLockAuth.3 XauUnlockAuth.3 XauWriteAut=
h.3 XauDisposeAuth.3 XauGetAuthByAddr.3 XauGetBestAuthByAddr.3
(for i in XauFileName.3 XauReadAuth.3 XauLockAuth.3 XauUnlockAuth.3 XauWrit=
eAuth.3 XauDisposeAuth.3 XauGetAuthByAddr.3 XauGetBestAuthByAddr.3 ; do ec=
ho .so
man3/Xau.3 > $i; done)
touch shadows.DONE
make all-am
if /bin/sh ./libtool --tag=3DCC --mode=3Dcompile cc -DHAVE_CONFIG_H -I. -=
I. -I. -I./include -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-=
prototypes
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing -I/usr/loc=
al/include -O2 -fno-strict-aliasing -pipe -MT AuDispose.lo -MD -MP -MF ".de=
ps/AuDi
spose.Tpo" -c -o AuDispose.lo AuDispose.c; then mv -f ".deps/AuDispose.Tpo=
" ".deps/AuDispose.Plo"; else rm -f ".deps/AuDispose.Tpo"; exit 1; fi
mkdir .libs
cc -DHAVE_CONFIG_H -I. -I. -I. -I./include -Wall -Wpointer-arith -Wstrict-=
prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fn=
o-stric
t-aliasing -I/usr/local/include -O2 -fno-strict-aliasing -pipe -MT AuDispos=
e.lo -MD -MP -MF .deps/AuDispose.Tpo -c AuDispose.c -fPIC -DPIC -o .libs/A=
uDispos
e.o
In file included from AuDispose.c:33:
=2E/include/X11/Xauth.h:48:31: X11/Xfuncproto.h: No such file or directory
=2E/include/X11/Xauth.h:49:27: X11/Xfuncs.h: No such file or directory
I will retry; this system had previously run xorg 7.2 before I dropped
it back to 6.9 today, so there is some nonzero chance that it had some
leftover files.
> > P.S. Dunno about non-portupgrade users, they may be SOL.
>=20
> Hand upgrade of eg xorg-libraries should work with (make build && make=20
> deinstall && make install). So if portupgrade alternatives work that way =
as=20
> well they should do the right thing. I'll do more tests but of course wip=
ing=20
> out ports, installing old xorg and upgrading to new takes a bit of time...
I am not really interested in supporting non-portupgrade utilities.
None of them seem to be sufficiently complete, e.g. portmaster doesn't
preserve old libraries leading to enormous trouble when shared
libraries are bumped (hi, gettext!), etc.
Kris
--pWyiEgJYm5f9v55/
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFGIYorWry0BWjoQKURAtblAKDB59WSn/Iyy/zB4MfWACqJOvk91gCghnZF
KAfm20QQmtYsjhXf+hsoH0c=
=M/L0
-----END PGP SIGNATURE-----
--pWyiEgJYm5f9v55/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070415021300.GA77534>