March 2006 - crux-commits

r1085 - crux-2.2/ports/opt/mpeg2dec
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: jaeger Date: 2006-03-30 21:42:12 +0200 (Thu, 30 Mar 2006) New Revision: 1085 Modified: crux-2.2/ports/opt/mpeg2dec/Pkgfile Log: mpeg2dec: updated homepage URL Modified: crux-2.2/ports/opt/mpeg2dec/Pkgfile =================================================================== --- crux-2.2/ports/opt/mpeg2dec/Pkgfile 2006-03-30 18:44:30 UTC (rev 1084) +++ crux-2.2/ports/opt/mpeg2dec/Pkgfile 2006-03-30 19:42:12 UTC (rev 1085) @@ -1,5 +1,5 @@ # Description: MPEG1/MPEG2 decoder (includes libmpeg2) -# URL: http://mpeg2dec.sourceforge.net +# URL: http://libmpeg2.sourceforge.net/ # Packager: Tilman Sauerbeck, tilman at code-monkey dot de # Maintainer: Matt Housh, jaeger at morpheus dot net

1 0

r1083 - crux-2.2/ports/opt/vsftpd
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: jue Date: 2006-03-30 19:28:25 +0200 (Thu, 30 Mar 2006) New Revision: 1083 Modified: crux-2.2/ports/opt/vsftpd/.footprint crux-2.2/ports/opt/vsftpd/Pkgfile Log: vsftpd: removed /var/ftp directory Modified: crux-2.2/ports/opt/vsftpd/.footprint =================================================================== --- crux-2.2/ports/opt/vsftpd/.footprint 2006-03-30 17:26:16 UTC (rev 1082) +++ crux-2.2/ports/opt/vsftpd/.footprint 2006-03-30 17:28:25 UTC (rev 1083) @@ -14,6 +14,5 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/vsftpd drwxr-xr-x root/root var/ -drwxr-xr-x root/root var/ftp/ drwxr-xr-x root/root var/log/ -rw-r--r-- root/root var/log/vsftpd.log (EMPTY) Modified: crux-2.2/ports/opt/vsftpd/Pkgfile =================================================================== --- crux-2.2/ports/opt/vsftpd/Pkgfile 2006-03-30 17:26:16 UTC (rev 1082) +++ crux-2.2/ports/opt/vsftpd/Pkgfile 2006-03-30 17:28:25 UTC (rev 1083) @@ -15,7 +15,7 @@ make make DESTDIR=$PKG install - install -d $PKG/{etc/{rc.d,ssl/certs},var/ftp,var/log} + install -d $PKG/{etc/{rc.d,ssl/certs},var/log} install -m 755 $SRC/vsftpd $PKG/etc/rc.d touch $PKG/etc/ssl/certs/$name.pem chmod 600 $PKG/etc/ssl/certs/$name.pem

1 0

r1082 - crux-2.2/ports/core/filesystem
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: jue Date: 2006-03-30 19:26:16 +0200 (Thu, 30 Mar 2006) New Revision: 1082 Modified: crux-2.2/ports/core/filesystem/.footprint crux-2.2/ports/core/filesystem/Pkgfile Log: filesystem: user root:root for /var/ftp Modified: crux-2.2/ports/core/filesystem/.footprint =================================================================== --- crux-2.2/ports/core/filesystem/.footprint 2006-03-30 17:05:09 UTC (rev 1081) +++ crux-2.2/ports/core/filesystem/.footprint 2006-03-30 17:26:16 UTC (rev 1082) @@ -45,7 +45,7 @@ drwxr-xr-x root/root var/ drwxr-xr-x root/root var/cache/ drwxr-xr-x root/root var/empty/ -drwxr-xr-x ftp/ftp var/ftp/ +drwxr-xr-x root/root var/ftp/ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/pkg/ drwxrwxrwt root/root var/lock/ Modified: crux-2.2/ports/core/filesystem/Pkgfile =================================================================== --- crux-2.2/ports/core/filesystem/Pkgfile 2006-03-30 17:05:09 UTC (rev 1081) +++ crux-2.2/ports/core/filesystem/Pkgfile 2006-03-30 17:26:16 UTC (rev 1082) @@ -4,7 +4,7 @@ name=filesystem version=2.2 -release=1 +release=2 source=(issue motd shells group passwd shadow securetty fstab mime.types) build() { @@ -45,7 +45,6 @@ ln -s spool/mail $PKG/var/mail mkdir $PKG/home - chown ftp.ftp $PKG/var/ftp chmod 1777 $PKG/var/spool/mail chmod 1777 $PKG/tmp chmod 1777 $PKG/var/lock

1 0

r1081 - crux-2.2/ports/opt/vsftpd
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: jue Date: 2006-03-30 19:05:09 +0200 (Thu, 30 Mar 2006) New Revision: 1081 Modified: crux-2.2/ports/opt/vsftpd/.footprint crux-2.2/ports/opt/vsftpd/Pkgfile Log: vsftp: use /var/ftp as data directory Modified: crux-2.2/ports/opt/vsftpd/.footprint =================================================================== --- crux-2.2/ports/opt/vsftpd/.footprint 2006-03-30 16:19:32 UTC (rev 1080) +++ crux-2.2/ports/opt/vsftpd/.footprint 2006-03-30 17:05:09 UTC (rev 1081) @@ -5,8 +5,6 @@ drwxr-xr-x root/root etc/ssl/certs/ -rw------- root/root etc/ssl/certs/vsftpd.pem (EMPTY) -rw------- root/root etc/vsftpd.conf -drwxr-xr-x root/root home/ -drwxr-xr-x root/root home/ftp/ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man5/ @@ -16,5 +14,6 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/vsftpd drwxr-xr-x root/root var/ +drwxr-xr-x root/root var/ftp/ drwxr-xr-x root/root var/log/ -rw-r--r-- root/root var/log/vsftpd.log (EMPTY) Modified: crux-2.2/ports/opt/vsftpd/Pkgfile =================================================================== --- crux-2.2/ports/opt/vsftpd/Pkgfile 2006-03-30 16:19:32 UTC (rev 1080) +++ crux-2.2/ports/opt/vsftpd/Pkgfile 2006-03-30 17:05:09 UTC (rev 1081) @@ -5,7 +5,7 @@ name=vsftpd version=2.0.4 -release=1 +release=2 source=(ftp://vsftpd.beasts.org/users/cevans/$name-$version.tar.gz \ $name-$version.patch vsftpd) @@ -15,7 +15,7 @@ make make DESTDIR=$PKG install - install -d $PKG/{etc/{rc.d,ssl/certs},home/ftp,var/log} + install -d $PKG/{etc/{rc.d,ssl/certs},var/ftp,var/log} install -m 755 $SRC/vsftpd $PKG/etc/rc.d touch $PKG/etc/ssl/certs/$name.pem chmod 600 $PKG/etc/ssl/certs/$name.pem

1 0

r1080 - crux-2.2/ports/opt/nvidia
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: jaeger Date: 2006-03-30 18:19:32 +0200 (Thu, 30 Mar 2006) New Revision: 1080 Modified: crux-2.2/ports/opt/nvidia/.footprint crux-2.2/ports/opt/nvidia/Pkgfile crux-2.2/ports/opt/nvidia/README Log: nvidia: updated for x11 6.9 and with information about gl-select Modified: crux-2.2/ports/opt/nvidia/.footprint =================================================================== --- crux-2.2/ports/opt/nvidia/.footprint 2006-03-30 16:18:14 UTC (rev 1079) +++ crux-2.2/ports/opt/nvidia/.footprint 2006-03-30 16:19:32 UTC (rev 1080) @@ -14,7 +14,6 @@ drwxr-xr-x root/root usr/X11R6/lib/modules/drivers/ -rwxr-xr-x root/root usr/X11R6/lib/modules/drivers/nvidia_drv.o drwxr-xr-x root/root usr/X11R6/lib/modules/extensions/ -lrwxrwxrwx root/root usr/X11R6/lib/modules/extensions/libglx.so -> libglx.so.1.0.8178 -rwxr-xr-x root/root usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178 drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/nvidia-settings Modified: crux-2.2/ports/opt/nvidia/Pkgfile =================================================================== --- crux-2.2/ports/opt/nvidia/Pkgfile 2006-03-30 16:18:14 UTC (rev 1079) +++ crux-2.2/ports/opt/nvidia/Pkgfile 2006-03-30 16:19:32 UTC (rev 1080) @@ -3,6 +3,8 @@ # Maintainer: Matt Housh, jaeger at morpheus dot net # Depends on: x11 +# Nice to have: gl-select + name=nvidia version=1.0-8178 release=1 @@ -30,6 +32,9 @@ # remove the documentation rm -rf $PKG/usr/share + # remove the conflicting libglx.so symlink + rm -f $PKG/usr/X11R6/lib/modules/extensions/libglx.so + # copy includes mkdir -p $PKG/usr/include/nvidia cp -r usr/include/GL $PKG/usr/include/nvidia/ Modified: crux-2.2/ports/opt/nvidia/README =================================================================== --- crux-2.2/ports/opt/nvidia/README 2006-03-30 16:18:14 UTC (rev 1079) +++ crux-2.2/ports/opt/nvidia/README 2006-03-30 16:19:32 UTC (rev 1080) @@ -1,14 +1,7 @@ -README for nvidia 1.0-6629+ +README for nvidia 1.0-8178+ -**** IMPORTANT **** -The POST-INSTALL only needs to be run *ONCE* after installing -the nvidia port. It is *NOT REQUIRED* when upgrading the port -if it has been run once when the port was originally installed. -**** IMPORTANT **** - - *** NOTE for nvidia with udev *** If using udev, add your user to the "video" group to be able to @@ -17,20 +10,28 @@ POST-INSTALL -Rename /usr/X11R6/lib/libGL.so.1.2 to something else, such -as libGL_so_1_2 and run /sbin/ldconfig. GL applications -should then use the nvidia-installed /usr/lib/libGL.so -instead. Rename /usr/X11R6/lib/modules/extensions/libGLcore.a -and libglx.a to something else, such as libGLcore.a.orig and -libglx.a.orig. +Use opt/gl-select from ports to select the correct gl/glx +libraries and extensions like so: -nvhelper.sh will do this for you (./nvhelper.sh --install) + # gl-select nvidia + POST-REMOVE -Rename /usr/X11R6/lib/libGL_so_1_2 (or whatever you called -it) to libGL.so.1.2 and run /sbin/ldconfig. Also restore -libglx.a and libGLcore.a in /usr/X11R6/lib/modules/extensions. +Use opt/gl-select from ports to revert to the x11 gl/glx libraries +and extensions like so: -nvhelper.sh will do this for you (./nvhelper.sh --restore) + # gl-select x11 + +When UPGRADING/DOWNGRADING the nvidia port (where the version changes), +use gl-select to revert to x11 and then re-select nvidia in order to +refresh the libGLcore and libGL symlinks, like so: + + # prt-get update nvidia + # gl-select x11; gl-select nvidia + + +nvhelper.sh is still included in the port for the time being but +gl-select is the preferred method. +

1 0

r1079 - in crux-2.2/ports/opt: . gl-select
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: jaeger Date: 2006-03-30 18:18:14 +0200 (Thu, 30 Mar 2006) New Revision: 1079 Added: crux-2.2/ports/opt/gl-select/ crux-2.2/ports/opt/gl-select/.footprint crux-2.2/ports/opt/gl-select/.md5sum crux-2.2/ports/opt/gl-select/Pkgfile crux-2.2/ports/opt/gl-select/gl-select Log: gl-select: initial import, version 1.0; a script which selects the active gl/glx libraries and extensions for x11 Added: crux-2.2/ports/opt/gl-select/.footprint =================================================================== --- crux-2.2/ports/opt/gl-select/.footprint (rev 0) +++ crux-2.2/ports/opt/gl-select/.footprint 2006-03-30 16:18:14 UTC (rev 1079) @@ -0,0 +1,3 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/gl-select Added: crux-2.2/ports/opt/gl-select/.md5sum =================================================================== --- crux-2.2/ports/opt/gl-select/.md5sum (rev 0) +++ crux-2.2/ports/opt/gl-select/.md5sum 2006-03-30 16:18:14 UTC (rev 1079) @@ -0,0 +1 @@ +b83334a550c8aa19dca7693dae087e18 gl-select Added: crux-2.2/ports/opt/gl-select/Pkgfile =================================================================== --- crux-2.2/ports/opt/gl-select/Pkgfile (rev 0) +++ crux-2.2/ports/opt/gl-select/Pkgfile 2006-03-30 16:18:14 UTC (rev 1079) @@ -0,0 +1,11 @@ +# Description: A selector for gl/glx libraries and extensions +# Maintainer: Matt Housh, jaeger at morpheus dot net + +name=gl-select +version=1.0 +release=1 +source=($name) + +build() { + install -D -m 0755 -o root -g root $SRC/$name $PKG/usr/bin/$name +} Added: crux-2.2/ports/opt/gl-select/gl-select =================================================================== --- crux-2.2/ports/opt/gl-select/gl-select (rev 0) +++ crux-2.2/ports/opt/gl-select/gl-select 2006-03-30 16:18:14 UTC (rev 1079) @@ -0,0 +1,105 @@ +#!/bin/bash +# +# gl-select: select active gl/glx libraries/extensions +# +# Matt Housh <jaeger(a)morpheus.net> +# + +usage() { + echo "Usage: $0 [x11|nvidia]" + exit +} + +# if other than a single argument is passed, spit out some help +if [ $# -ne 1 ] +then + usage + exit 1 +fi + +# check for the x11 port; if it's not installed, why is this script even run? +if [ -z "`pkginfo -i | awk '{ print $1 }' | grep ^x11$`" ] +then + echo "x11 isn't installed!" + exit 1 +fi + +# perform the selection for the following supported gl/glx setups +case "$1" in + "x11") + echo "* x11 gl/glx selected" + + # check for the existence of libglx_so, libGL_so_1_2 and friends + # if none, nothing is necessary or the backups have been erased + BACKUPS="/usr/X11R6/lib/modules/extensions/libglx_so \ + /usr/X11R6/lib/modules/extensions/libGLcore_so \ + /usr/X11R6/lib/libGL_so_1_2 \ + /usr/X11R6/lib/libGL_a" + for F in $BACKUPS + do + if [ ! -e $F ] + then + echo "One or more of the non-x11 gl/glx backup files are missing. This means" + echo "either you're not using a non-x11 gl/glx setup, in which case nothing" + echo "needs to be changed, OR your x11 backups are missing, which can be" + echo "solved by reinstalling the x11 package from the CRUX CD or ports." + exit 1 + fi + done + # move the x11 backups back into place + echo -n "libglx " + rm -f /usr/X11R6/lib/modules/extensions/libglx.so + mv /usr/X11R6/lib/modules/extensions/libglx{_so,.so} + echo -n "libGLcore " + rm -f /usr/X11R6/lib/modules/extensions/libGLcore.so + mv /usr/X11R6/lib/modules/extensions/libGLcore{_so,.so} + echo -n "libGL " + mv /usr/X11R6/lib/libGL{_so_1_2,.so.1.2} + mv /usr/X11R6/lib/libGL{_a,.a} + ;; + "nvidia") + echo "* nvidia gl/glx selected" + + # is the nvidia port installed? + if [ -z "`pkginfo -i | awk '{ print $1 }' | grep ^nvidia$`" ] + then + echo "nvidia port isn't installed!" + exit 1 + fi + + # get the .so version number + NV_VER="`pkginfo -i | grep "^nvidia " | awk '{ print $2 }' | cut -d- -f2`" + + # check for the existence of libglx_so and libGL_so_1_2 + # if none, move the x11 stuff out of the way for nvidia's + if [ ! -e /usr/X11R6/lib/modules/extensions/libglx_so -a ! -e \ + /usr/X11R6/lib/libGL_so_1_2 ] + then + echo -n "libglx " + mv /usr/X11R6/lib/modules/extensions/libglx{.so,_so} + ln -s libglx.so.1.0.$NV_VER \ + /usr/X11R6/lib/modules/extensions/libglx.so + echo -n "libGLcore " + mv /usr/X11R6/lib/modules/extensions/libGLcore{.so,_so} + ln -s /usr/lib/libGLcore.so.1.0.$NV_VER \ + /usr/X11R6/lib/modules/extensions/libGLcore.so + echo -n "libGL " + mv /usr/X11R6/lib/libGL{.so.1.2,_so_1_2} + mv /usr/X11R6/lib/libGL{.a,_a} + rm /usr/X11R6/lib/libGL.so* + else + echo "You appear to already be using a non-x11 gl/glx setup. If the" + echo "one selected isn't the correct one, revert to x11 and then select" + echo "the correct new setup using 'gl-select x11; gl-select <new gl/glx>'." + exit 1 + fi + ;; + *) + usage + ;; +esac + +/sbin/ldconfig > /dev/null 2>&1 +echo "done." + +# End of file Property changes on: crux-2.2/ports/opt/gl-select/gl-select ___________________________________________________________________ Name: svn:executable + *

1 0

r1078 - crux-2.2/ports/opt/lyx
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: sip Date: 2006-03-30 17:33:19 +0200 (Thu, 30 Mar 2006) New Revision: 1078 Modified: crux-2.2/ports/opt/lyx/.footprint crux-2.2/ports/opt/lyx/.md5sum crux-2.2/ports/opt/lyx/Pkgfile Log: lyx: updated to 1.4.0 (from 2.1) Modified: crux-2.2/ports/opt/lyx/.footprint =================================================================== --- crux-2.2/ports/opt/lyx/.footprint 2006-03-30 15:11:29 UTC (rev 1077) +++ crux-2.2/ports/opt/lyx/.footprint 2006-03-30 15:33:19 UTC (rev 1078) @@ -1,12 +1,13 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/lyx --rwxr-xr-x root/root usr/bin/noweb2lyx --rwxr-xr-x root/root usr/bin/reLyX +-rwxr-xr-x root/root usr/bin/lyxclient +-rwxr-xr-x root/root usr/bin/tex2lyx drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/lyx.1.gz --rw-r--r-- root/root usr/man/man1/reLyX.1.gz +-rw-r--r-- root/root usr/man/man1/lyxclient.1.gz +-rw-r--r-- root/root usr/man/man1/tex2lyx.1.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/lyx/ -rw-r--r-- root/root usr/share/lyx/CREDITS @@ -40,7 +41,6 @@ -rw-r--r-- root/root usr/share/lyx/doc/Intro.lyx -rw-r--r-- root/root usr/share/lyx/doc/LaTeXConfig.lyx -rw-r--r-- root/root usr/share/lyx/doc/LaTeXConfig.lyx.in --rw-r--r-- root/root usr/share/lyx/doc/LyXConfig.lyx.in -rw-r--r-- root/root usr/share/lyx/doc/Reference.lyx -rw-r--r-- root/root usr/share/lyx/doc/TOC.lyx -rw-r--r-- root/root usr/share/lyx/doc/Tutorial.lyx @@ -85,11 +85,11 @@ -rw-r--r-- root/root usr/share/lyx/doc/it_Tutorial.lyx -rw-r--r-- root/root usr/share/lyx/doc/it_UserGuide.lyx -rw-r--r-- root/root usr/share/lyx/doc/mobius.eps +-rw-r--r-- root/root usr/share/lyx/doc/nb_Intro.lyx +-rw-r--r-- root/root usr/share/lyx/doc/nb_TOC.lyx -rw-r--r-- root/root usr/share/lyx/doc/nl_Intro.lyx -rw-r--r-- root/root usr/share/lyx/doc/nl_TOC.lyx -rw-r--r-- root/root usr/share/lyx/doc/nl_Tutorial.lyx --rw-r--r-- root/root usr/share/lyx/doc/no_Intro.lyx --rw-r--r-- root/root usr/share/lyx/doc/no_TOC.lyx -rw-r--r-- root/root usr/share/lyx/doc/pl_Extended.lyx -rw-r--r-- root/root usr/share/lyx/doc/pl_Intro.lyx -rw-r--r-- root/root usr/share/lyx/doc/pl_TOC.lyx @@ -115,50 +115,68 @@ -rw-r--r-- root/root usr/share/lyx/doc/sv_Tutorial.lyx -rw-r--r-- root/root usr/share/lyx/encodings -rw-r--r-- root/root usr/share/lyx/external_templates -drwxr-xr-x root/root usr/share/lyx/help/ --rw-r--r-- root/root usr/share/lyx/help/Bibtex.hlp --rw-r--r-- root/root usr/share/lyx/help/Texinfo.hlp drwxr-xr-x root/root usr/share/lyx/images/ -rw-r--r-- root/root usr/share/lyx/images/amssymb.xpm -rw-r--r-- root/root usr/share/lyx/images/banner.ppm +-rw-r--r-- root/root usr/share/lyx/images/bookmark-goto.xpm +-rw-r--r-- root/root usr/share/lyx/images/bookmark-save.xpm +-rw-r--r-- root/root usr/share/lyx/images/break-line.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-close.xpm --rw-r--r-- root/root usr/share/lyx/images/buffer-export_ascii.xpm +-rw-r--r-- root/root usr/share/lyx/images/buffer-export_dvi.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-export_latex.xpm +-rw-r--r-- root/root usr/share/lyx/images/buffer-export_ps.xpm +-rw-r--r-- root/root usr/share/lyx/images/buffer-export_text.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-new.xpm --rw-r--r-- root/root usr/share/lyx/images/buffer-print.xpm +-rw-r--r-- root/root usr/share/lyx/images/buffer-reload.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-update_dvi.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-update_ps.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-view_dvi.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-view_ps.xpm +-rw-r--r-- root/root usr/share/lyx/images/buffer-write-as.xpm -rw-r--r-- root/root usr/share/lyx/images/buffer-write.xpm -rw-r--r-- root/root usr/share/lyx/images/build-program.xpm --rw-r--r-- root/root usr/share/lyx/images/citation-insert.xpm -rw-r--r-- root/root usr/share/lyx/images/copy.xpm -rw-r--r-- root/root usr/share/lyx/images/cut.xpm -rw-r--r-- root/root usr/share/lyx/images/depth-decrement.xpm -rw-r--r-- root/root usr/share/lyx/images/depth-increment.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-preferences.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show-new-inset_citation.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show-new-inset_graphics.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show-new-inset_include.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show-new-inset_ref.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show_character.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show_findreplace.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show_mathpanel.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show_print.xpm +-rw-r--r-- root/root usr/share/lyx/images/dialog-show_spellchecker.xpm -rw-r--r-- root/root usr/share/lyx/images/down.xpm -rw-r--r-- root/root usr/share/lyx/images/ert-insert.xpm -rw-r--r-- root/root usr/share/lyx/images/file-open.xpm --rw-r--r-- root/root usr/share/lyx/images/find-replace.xpm +-rw-r--r-- root/root usr/share/lyx/images/float-insert_figure.xpm +-rw-r--r-- root/root usr/share/lyx/images/float-insert_table.xpm -rw-r--r-- root/root usr/share/lyx/images/font-bold.xpm -rw-r--r-- root/root usr/share/lyx/images/font-emph.xpm --rw-r--r-- root/root usr/share/lyx/images/font-free.xpm +-rw-r--r-- root/root usr/share/lyx/images/font-free-apply.xpm -rw-r--r-- root/root usr/share/lyx/images/font-noun.xpm -rw-r--r-- root/root usr/share/lyx/images/font-sans.xpm -rw-r--r-- root/root usr/share/lyx/images/footnote-insert.xpm --rw-r--r-- root/root usr/share/lyx/images/graphics-insert.xpm -rw-r--r-- root/root usr/share/lyx/images/index-insert.xpm -rw-r--r-- root/root usr/share/lyx/images/label-insert.xpm --rw-r--r-- root/root usr/share/lyx/images/layout.xpm +-rw-r--r-- root/root usr/share/lyx/images/layout-document.xpm +-rw-r--r-- root/root usr/share/lyx/images/layout-paragraph.xpm +-rw-r--r-- root/root usr/share/lyx/images/layout_Description.xpm +-rw-r--r-- root/root usr/share/lyx/images/layout_Enumerate.xpm +-rw-r--r-- root/root usr/share/lyx/images/layout_Itemize.xpm +-rw-r--r-- root/root usr/share/lyx/images/layout_List.xpm -rw-r--r-- root/root usr/share/lyx/images/layout_LyX-Code.xpm -rw-r--r-- root/root usr/share/lyx/images/layout_Scrap.xpm -rw-r--r-- root/root usr/share/lyx/images/layout_Section.xpm -rw-r--r-- root/root usr/share/lyx/images/lyx-quit.xpm -rw-r--r-- root/root usr/share/lyx/images/lyx.xpm -rw-r--r-- root/root usr/share/lyx/images/marginalnote-insert.xpm +-rw-r--r-- root/root usr/share/lyx/images/math-display.xpm +-rw-r--r-- root/root usr/share/lyx/images/math-matrix.xpm -rw-r--r-- root/root usr/share/lyx/images/math-mode.xpm --rw-r--r-- root/root usr/share/lyx/images/math-panel.xpm -rw-r--r-- root/root usr/share/lyx/images/math-subscript.xpm -rw-r--r-- root/root usr/share/lyx/images/math-superscript.xpm drwxr-xr-x root/root usr/share/lyx/images/math/ @@ -223,6 +241,7 @@ -rw-r--r-- root/root usr/share/lyx/images/math/bumpeq2.xpm -rw-r--r-- root/root usr/share/lyx/images/math/cap.xpm -rw-r--r-- root/root usr/share/lyx/images/math/cap2.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/cases.xpm -rw-r--r-- root/root usr/share/lyx/images/math/cdot.xpm -rw-r--r-- root/root usr/share/lyx/images/math/cdots.xpm -rw-r--r-- root/root usr/share/lyx/images/math/centerdot.xpm @@ -329,8 +348,11 @@ -rw-r--r-- root/root usr/share/lyx/images/math/lambda2.xpm -rw-r--r-- root/root usr/share/lyx/images/math/langle.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lbrace.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/lbrace_rbrace.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lbracket.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/lbracket_rbracket.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lceil.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/lceil_rceil.xpm -rw-r--r-- root/root usr/share/lyx/images/math/ldots.xpm -rw-r--r-- root/root usr/share/lyx/images/math/leftarrow.xpm -rw-r--r-- root/root usr/share/lyx/images/math/leftarrow2.xpm @@ -354,6 +376,7 @@ -rw-r--r-- root/root usr/share/lyx/images/math/lessgtr.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lesssim.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lfloor.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/lfloor_rfloor.xpm -rw-r--r-- root/root usr/share/lyx/images/math/ll.xpm -rw-r--r-- root/root usr/share/lyx/images/math/llcorner.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lll.xpm @@ -372,6 +395,7 @@ -rw-r--r-- root/root usr/share/lyx/images/math/looparrowright.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lozenge.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lparen.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/lparen_rparen.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lrcorner.xpm -rw-r--r-- root/root usr/share/lyx/images/math/ltimes.xpm -rw-r--r-- root/root usr/share/lyx/images/math/lvertneqq.xpm @@ -490,6 +514,7 @@ -rw-r--r-- root/root usr/share/lyx/images/math/rightsquigarrow.xpm -rw-r--r-- root/root usr/share/lyx/images/math/rightthreetimes.xpm -rw-r--r-- root/root usr/share/lyx/images/math/risingdotseq.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/root.xpm -rw-r--r-- root/root usr/share/lyx/images/math/rparen.xpm -rw-r--r-- root/root usr/share/lyx/images/math/rtimes.xpm -rw-r--r-- root/root usr/share/lyx/images/math/searrow.xpm @@ -540,8 +565,8 @@ -rw-r--r-- root/root usr/share/lyx/images/math/surd.xpm -rw-r--r-- root/root usr/share/lyx/images/math/swarrow.xpm -rw-r--r-- root/root usr/share/lyx/images/math/tau.xpm --rw-r--r-- root/root usr/share/lyx/images/math/textrm_0.xpm --rw-r--r-- root/root usr/share/lyx/images/math/textrm_A.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/textrm_AA.xpm +-rw-r--r-- root/root usr/share/lyx/images/math/textrm_Oe.xpm -rw-r--r-- root/root usr/share/lyx/images/math/therefore.xpm -rw-r--r-- root/root usr/share/lyx/images/math/theta.xpm -rw-r--r-- root/root usr/share/lyx/images/math/theta2.xpm @@ -607,7 +632,7 @@ -rw-r--r-- root/root usr/share/lyx/images/math/xi.xpm -rw-r--r-- root/root usr/share/lyx/images/math/xi2.xpm -rw-r--r-- root/root usr/share/lyx/images/math/zeta.xpm --rw-r--r-- root/root usr/share/lyx/images/melt.xpm +-rw-r--r-- root/root usr/share/lyx/images/note-insert.xpm -rw-r--r-- root/root usr/share/lyx/images/paste.xpm -rw-r--r-- root/root usr/share/lyx/images/psnfss1.xpm -rw-r--r-- root/root usr/share/lyx/images/psnfss2.xpm @@ -615,10 +640,33 @@ -rw-r--r-- root/root usr/share/lyx/images/psnfss4.xpm -rw-r--r-- root/root usr/share/lyx/images/redo.xpm -rw-r--r-- root/root usr/share/lyx/images/standard.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_align-center.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_align-left.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_align-right.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_append-column.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_append-row.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_delete-column.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_delete-row.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_multicolumn.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_set-all-lines.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_set-longtabular.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_set-rotate-cell.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_set-rotate-tabular.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_toggle-line-bottom.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_toggle-line-left.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_toggle-line-right.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_toggle-line-top.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_unset-all-lines.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_valign-bottom.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_valign-middle.xpm +-rw-r--r-- root/root usr/share/lyx/images/tabular-feature_valign-top.xpm -rw-r--r-- root/root usr/share/lyx/images/tabular-insert.xpm +-rw-r--r-- root/root usr/share/lyx/images/thesaurus-entry.xpm +-rw-r--r-- root/root usr/share/lyx/images/toc-view.xpm -rw-r--r-- root/root usr/share/lyx/images/undo.xpm -rw-r--r-- root/root usr/share/lyx/images/unknown.xpm -rw-r--r-- root/root usr/share/lyx/images/up.xpm +-rw-r--r-- root/root usr/share/lyx/images/url-insert.xpm drwxr-xr-x root/root usr/share/lyx/kbd/ -rw-r--r-- root/root usr/share/lyx/kbd/american-2.kmap -rw-r--r-- root/root usr/share/lyx/kbd/american.kmap @@ -679,6 +727,12 @@ -rw-r--r-- root/root usr/share/lyx/layouts/aapaper.inc -rw-r--r-- root/root usr/share/lyx/layouts/aapaper.layout -rw-r--r-- root/root usr/share/lyx/layouts/aastex.layout +-rw-r--r-- root/root usr/share/lyx/layouts/agu-dtd.layout +-rw-r--r-- root/root usr/share/lyx/layouts/agu_stdclass.inc +-rw-r--r-- root/root usr/share/lyx/layouts/agu_stdcounters.inc +-rw-r--r-- root/root usr/share/lyx/layouts/agu_stdlists.inc +-rw-r--r-- root/root usr/share/lyx/layouts/agu_stdsections.inc +-rw-r--r-- root/root usr/share/lyx/layouts/agu_stdtitle.inc -rw-r--r-- root/root usr/share/lyx/layouts/agums.layout -rw-r--r-- root/root usr/share/lyx/layouts/aguplus.inc -rw-r--r-- root/root usr/share/lyx/layouts/amsart-plain.layout @@ -697,6 +751,7 @@ -rw-r--r-- root/root usr/share/lyx/layouts/cl2emult.layout -rw-r--r-- root/root usr/share/lyx/layouts/cv.layout -rw-r--r-- root/root usr/share/lyx/layouts/db_lyxmacros.inc +-rw-r--r-- root/root usr/share/lyx/layouts/db_stdcharstyles.inc -rw-r--r-- root/root usr/share/lyx/layouts/db_stdclass.inc -rw-r--r-- root/root usr/share/lyx/layouts/db_stdcounters.inc -rw-r--r-- root/root usr/share/lyx/layouts/db_stdlayouts.inc @@ -743,7 +798,9 @@ -rw-r--r-- root/root usr/share/lyx/layouts/mwart.layout -rw-r--r-- root/root usr/share/lyx/layouts/mwbk.layout -rw-r--r-- root/root usr/share/lyx/layouts/mwrep.layout --rw-r--r-- root/root usr/share/lyx/layouts/obsolete.inc +-rw-r--r-- root/root usr/share/lyx/layouts/numarticle.inc +-rw-r--r-- root/root usr/share/lyx/layouts/numreport.inc +-rw-r--r-- root/root usr/share/lyx/layouts/numrevtex.inc -rw-r--r-- root/root usr/share/lyx/layouts/paper.layout -rw-r--r-- root/root usr/share/lyx/layouts/report.layout -rw-r--r-- root/root usr/share/lyx/layouts/revtex.layout @@ -753,7 +810,6 @@ -rw-r--r-- root/root usr/share/lyx/layouts/scrclass.inc -rw-r--r-- root/root usr/share/lyx/layouts/scrlettr.layout -rw-r--r-- root/root usr/share/lyx/layouts/scrlttr2.layout --rw-r--r-- root/root usr/share/lyx/layouts/scrmacros.inc -rw-r--r-- root/root usr/share/lyx/layouts/scrreprt.layout -rw-r--r-- root/root usr/share/lyx/layouts/seminar.layout -rw-r--r-- root/root usr/share/lyx/layouts/siamltex.layout @@ -774,56 +830,70 @@ -rw-r--r-- root/root usr/share/lyx/layouts/svjour.inc -rw-r--r-- root/root usr/share/lyx/layouts/svprobth.layout drwxr-xr-x root/root usr/share/lyx/lyx2lyx/ --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/LyX.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx2lyx --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_0_12.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_0_0.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_0_1.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_1_4.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_1_5.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_1_6.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_1_6fix3.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_2.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_3.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/lyx_1_4.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/parser_tools.py --rwxr-xr-x root/root usr/share/lyx/lyx2lyx/profiling.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/LyX.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/LyX.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/LyX.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx2lyx +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_0_12.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_0_12.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_0_12.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_0_0.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_0_0.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_0_0.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_0_1.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_0_1.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_0_1.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_4.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_4.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_4.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_5.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_5.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_5.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_6.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_6.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_6.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_6fix3.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_6fix3.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_1_6fix3.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_2.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_2.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_2.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_3.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_3.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_3.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_4.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_4.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/lyx_1_4.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/parser_tools.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/parser_tools.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/parser_tools.pyo +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/profiling.py +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/profiling.pyc +-rw-r--r-- root/root usr/share/lyx/lyx2lyx/profiling.pyo -rw-r--r-- root/root usr/share/lyx/lyxrc.defaults -rw-r--r-- root/root usr/share/lyx/lyxrc.example -rw-r--r-- root/root usr/share/lyx/packages.lst -drwxr-xr-x root/root usr/share/lyx/reLyX/ --rw-r--r-- root/root usr/share/lyx/reLyX/BUGS --rw-r--r-- root/root usr/share/lyx/reLyX/BasicLyX.pm --rw-r--r-- root/root usr/share/lyx/reLyX/CHANGES --rw-r--r-- root/root usr/share/lyx/reLyX/CleanTeX.pm --rw-r--r-- root/root usr/share/lyx/reLyX/LastLyX.pm --rw-r--r-- root/root usr/share/lyx/reLyX/MakePreamble.pm --rw-r--r-- root/root usr/share/lyx/reLyX/README --rw-r--r-- root/root usr/share/lyx/reLyX/ReadCommands.pm --rw-r--r-- root/root usr/share/lyx/reLyX/RelyxFigure.pm --rw-r--r-- root/root usr/share/lyx/reLyX/RelyxTable.pm -drwxr-xr-x root/root usr/share/lyx/reLyX/Text/ --rw-r--r-- root/root usr/share/lyx/reLyX/Text/TeX.pm --rw-r--r-- root/root usr/share/lyx/reLyX/Verbatim.pm --rw-r--r-- root/root usr/share/lyx/reLyX/reLyX.pod --rw-r--r-- root/root usr/share/lyx/reLyX/reLyXmain.pl --rw-r--r-- root/root usr/share/lyx/reLyX/syntax.default drwxr-xr-x root/root usr/share/lyx/scripts/ -rwxr-xr-x root/root usr/share/lyx/scripts/TeXFiles.sh -rwxr-xr-x root/root usr/share/lyx/scripts/convertDefault.sh -rwxr-xr-x root/root usr/share/lyx/scripts/fen2ascii.py --rwxr-xr-x root/root usr/share/lyx/scripts/fig2pstex.py --rwxr-xr-x root/root usr/share/lyx/scripts/general_command_wrapper.py +-rwxr-xr-x root/root usr/share/lyx/scripts/fig2pdftex.sh +-rwxr-xr-x root/root usr/share/lyx/scripts/fig2pstex.sh +-rwxr-xr-x root/root usr/share/lyx/scripts/fig_copy.sh +-rwxr-xr-x root/root usr/share/lyx/scripts/layout2layout.py +-rwxr-xr-x root/root usr/share/lyx/scripts/legacy_lyxpreview2ppm.py -rwxr-xr-x root/root usr/share/lyx/scripts/listerrors --rwxr-xr-x root/root usr/share/lyx/scripts/lyxpreview2ppm.py --rwxr-xr-x root/root usr/share/lyx/scripts/pic2ascii.py --rwxr-xr-x root/root usr/share/lyx/scripts/pic2png_eps.py --rwxr-xr-x root/root usr/share/lyx/scripts/pic2png_eps.sh +-rwxr-xr-x root/root usr/share/lyx/scripts/lyxpreview2bitmap.py +-rwxr-xr-x root/root usr/share/lyx/scripts/lyxpreview_tools.py +-rwxr-xr-x root/root usr/share/lyx/scripts/tex_copy.py -rw-r--r-- root/root usr/share/lyx/symbols +-rw-r--r-- root/root usr/share/lyx/syntax.default drwxr-xr-x root/root usr/share/lyx/templates/ -rw-r--r-- root/root usr/share/lyx/templates/IEEEtran.lyx +-rw-r--r-- root/root usr/share/lyx/templates/README.new_templates -rw-r--r-- root/root usr/share/lyx/templates/aa.lyx -rw-r--r-- root/root usr/share/lyx/templates/aastex.lyx +-rw-r--r-- root/root usr/share/lyx/templates/agu_article.lyx -rw-r--r-- root/root usr/share/lyx/templates/dinbrief.lyx -rw-r--r-- root/root usr/share/lyx/templates/docbook_article.lyx -rw-r--r-- root/root usr/share/lyx/templates/elsart.lyx @@ -848,16 +918,7 @@ -rw-r--r-- root/root usr/share/lyx/tex/revtex.cls -rw-r--r-- root/root usr/share/lyx/textclass.lst drwxr-xr-x root/root usr/share/lyx/ui/ +-rw-r--r-- root/root usr/share/lyx/ui/classic.ui -rw-r--r-- root/root usr/share/lyx/ui/default.ui -drwxr-xr-x root/root usr/share/lyx/xfonts/ --rw-r--r-- root/root usr/share/lyx/xfonts/PSres.upr -lrwxrwxrwx root/root usr/share/lyx/xfonts/cmex10.pfb -> /usr/share/texmf/fonts/type1/bluesky/cm/cmex10.pfb -lrwxrwxrwx root/root usr/share/lyx/xfonts/cmmi10.pfb -> /usr/share/texmf/fonts/type1/bluesky/cm/cmmi10.pfb -lrwxrwxrwx root/root usr/share/lyx/xfonts/cmr10.pfb -> /usr/share/texmf/fonts/type1/bluesky/cm/cmr10.pfb -lrwxrwxrwx root/root usr/share/lyx/xfonts/cmsy10.pfb -> /usr/share/texmf/fonts/type1/bluesky/cm/cmsy10.pfb -lrwxrwxrwx root/root usr/share/lyx/xfonts/eufm10.pfb -> /usr/share/texmf/fonts/type1/bluesky/euler/eufm10.pfb --rw-r--r-- root/root usr/share/lyx/xfonts/fonts.dir --rw-r--r-- root/root usr/share/lyx/xfonts/fonts.scale -lrwxrwxrwx root/root usr/share/lyx/xfonts/msam10.pfb -> /usr/share/texmf/fonts/type1/bluesky/symbols/msam10.pfb -lrwxrwxrwx root/root usr/share/lyx/xfonts/msbm10.pfb -> /usr/share/texmf/fonts/type1/bluesky/symbols/msbm10.pfb -lrwxrwxrwx root/root usr/share/lyx/xfonts/wasy10.pfb -> /usr/share/texmf/fonts/type1/hoekwater/wasy/wasy10.pfb +-rw-r--r-- root/root usr/share/lyx/ui/stdmenus.ui +-rw-r--r-- root/root usr/share/lyx/ui/stdtoolbars.ui Modified: crux-2.2/ports/opt/lyx/.md5sum =================================================================== --- crux-2.2/ports/opt/lyx/.md5sum 2006-03-30 15:11:29 UTC (rev 1077) +++ crux-2.2/ports/opt/lyx/.md5sum 2006-03-30 15:33:19 UTC (rev 1078) @@ -1 +1 @@ -26d745b98bdc32e9edfc28e581583f80 lyx-1.3.6.tar.bz2 +5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 Modified: crux-2.2/ports/opt/lyx/Pkgfile =================================================================== --- crux-2.2/ports/opt/lyx/Pkgfile 2006-03-30 15:11:29 UTC (rev 1077) +++ crux-2.2/ports/opt/lyx/Pkgfile 2006-03-30 15:33:19 UTC (rev 1078) @@ -5,7 +5,7 @@ # Depends on: tetex, qt3, imagemagick name=lyx -version=1.3.6 +version=1.4.0 release=1 source=(ftp://ftp.lyx.org/pub/$name/stable/$name-$version.tar.bz2)

1 0

r1077 - crux-2.2/ports/opt/slim
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: sip Date: 2006-03-30 17:11:29 +0200 (Thu, 30 Mar 2006) New Revision: 1077 Modified: crux-2.2/ports/opt/slim/.footprint crux-2.2/ports/opt/slim/.md5sum crux-2.2/ports/opt/slim/Pkgfile Log: slim: added CRUX theme by popular request :) Modified: crux-2.2/ports/opt/slim/.footprint =================================================================== --- crux-2.2/ports/opt/slim/.footprint 2006-03-30 14:11:17 UTC (rev 1076) +++ crux-2.2/ports/opt/slim/.footprint 2006-03-30 15:11:29 UTC (rev 1077) @@ -11,6 +11,10 @@ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/slim/ drwxr-xr-x root/root usr/share/slim/themes/ +drwxr-xr-x root/root usr/share/slim/themes/crux-smooth/ +-rw-r--r-- root/root usr/share/slim/themes/crux-smooth/background.jpg +-rw-r--r-- root/root usr/share/slim/themes/crux-smooth/panel.png +-rw-r--r-- root/root usr/share/slim/themes/crux-smooth/slim.theme drwxr-xr-x root/root usr/share/slim/themes/default/ -rw-r--r-- root/root usr/share/slim/themes/default/background.jpg -rw-r--r-- root/root usr/share/slim/themes/default/panel.png Modified: crux-2.2/ports/opt/slim/.md5sum =================================================================== --- crux-2.2/ports/opt/slim/.md5sum 2006-03-30 14:11:17 UTC (rev 1076) +++ crux-2.2/ports/opt/slim/.md5sum 2006-03-30 15:11:29 UTC (rev 1077) @@ -1,2 +1,3 @@ b4aec9724050cf0fd582f8a39bf30f1e slim-1.2.4.tar.gz +46349c2dc378b17d5857c5c1d904a636 slim-crux-smooth.tar.gz 476ce747c77f1a7e116a7f63bfb7d8d3 slim.rc Modified: crux-2.2/ports/opt/slim/Pkgfile =================================================================== --- crux-2.2/ports/opt/slim/Pkgfile 2006-03-30 14:11:17 UTC (rev 1076) +++ crux-2.2/ports/opt/slim/Pkgfile 2006-03-30 15:11:29 UTC (rev 1077) @@ -6,9 +6,9 @@ name=slim version=1.2.4 -release=1 -source=(http://download.berlios.de/$name/$name-$version.tar.gz - $name.rc) +release=2 +source=(http://download.berlios.de/$name/$name-$version.tar.gz \ + http://jw.tks6.net/files/slim-crux-smooth.tar.gz $name.rc) build () { cd $name-$version @@ -16,4 +16,9 @@ make DESTDIR=$PKG install mkdir $PKG/etc/rc.d install -m 755 ../$name.rc $PKG/etc/rc.d/$name + cd ../ + + rm -f slim-crux-smooth/README + cp -r slim-crux-smooth $PKG/usr/share/slim/themes/crux-smooth + chmod 0644 $PKG/usr/share/slim/themes/crux-smooth/* }

1 0

r1076 - crux-2.2/ports/opt/qemu
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: jaeger Date: 2006-03-30 16:11:17 +0200 (Thu, 30 Mar 2006) New Revision: 1076 Added: crux-2.2/ports/opt/qemu/qemu-0.7.0-gcc4.patch crux-2.2/ports/opt/qemu/qemu-0.7.2-dyngen-check-stack-clobbers.patch crux-2.2/ports/opt/qemu/qemu-0.7.2-gcc4-opts.patch crux-2.2/ports/opt/qemu/qemu-0.8.0-gcc4-hacks.patch Modified: crux-2.2/ports/opt/qemu/.md5sum crux-2.2/ports/opt/qemu/Pkgfile Log: qemu: added patches for compilation with gcc4 Modified: crux-2.2/ports/opt/qemu/.md5sum =================================================================== --- crux-2.2/ports/opt/qemu/.md5sum 2006-03-30 13:34:05 UTC (rev 1075) +++ crux-2.2/ports/opt/qemu/.md5sum 2006-03-30 14:11:17 UTC (rev 1076) @@ -1,2 +1,6 @@ 02cfdecda90458d6393781496ec6b48b kqemu-0.7.2.tar.gz +4860921fbf6a928cf0e132ecc5e43dcc qemu-0.7.0-gcc4.patch +88fd85405713717ef7c239acfa4720f0 qemu-0.7.2-dyngen-check-stack-clobbers.patch +aaa22a7297ac7685cb462e3ec1668e79 qemu-0.7.2-gcc4-opts.patch +cb2b0532b6eab6f80c14b33cfba70662 qemu-0.8.0-gcc4-hacks.patch eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz Modified: crux-2.2/ports/opt/qemu/Pkgfile =================================================================== --- crux-2.2/ports/opt/qemu/Pkgfile 2006-03-30 13:34:05 UTC (rev 1075) +++ crux-2.2/ports/opt/qemu/Pkgfile 2006-03-30 14:11:17 UTC (rev 1076) @@ -6,20 +6,34 @@ name=qemu version=0.8.0 -release=1 +release=2 source=(http://fabrice.bellard.free.fr/$name/$name-$version.tar.gz \ - http://fabrice.bellard.free.fr/$name/kqemu-0.7.2.tar.gz) + http://fabrice.bellard.free.fr/$name/kqemu-0.7.2.tar.gz \ + $name-0.7.0-gcc4.patch \ + $name-0.7.2-dyngen-check-stack-clobbers.patch \ + $name-0.7.2-gcc4-opts.patch \ + $name-0.8.0-gcc4-hacks.patch) build() { - cd $name-$version - mv $SRC/kqemu . + cd $name-$version + mv $SRC/kqemu . - ./configure --prefix=/usr --enable-adlib --target-list=i386-softmmu - make + patch -p1 -i $SRC/$name-0.7.0-gcc4.patch + patch -p1 -i $SRC/$name-0.7.2-dyngen-check-stack-clobbers.patch + patch -p1 -i $SRC/$name-0.7.2-gcc4-opts.patch + patch -p1 -i $SRC/$name-0.8.0-gcc4-hacks.patch - sed -i 's:cd kqemu ; ./install.sh::' Makefile - make bindir=$PKG/usr/bin datadir=$PKG/usr/share/qemu docdir=$PKG/usr/share/doc mandir=$PKG/usr/man install - install -D -m 0755 kqemu/kqemu.ko $PKG/lib/modules/`uname -r`/misc/kqemu.ko + ./configure --prefix=/usr \ + --enable-adlib \ + --target-list=i386-softmmu \ + --disable-gcc-check + make - rm -rf $PKG/usr/share/doc + sed -i 's:cd kqemu ; ./install.sh::' Makefile + make bindir=$PKG/usr/bin datadir=$PKG/usr/share/qemu \ + docdir=$PKG/usr/share/doc mandir=$PKG/usr/man install + install -D -m 0755 kqemu/kqemu.ko \ + $PKG/lib/modules/`uname -r`/misc/kqemu.ko + + rm -rf $PKG/usr/share/doc } Added: crux-2.2/ports/opt/qemu/qemu-0.7.0-gcc4.patch =================================================================== --- crux-2.2/ports/opt/qemu/qemu-0.7.0-gcc4.patch (rev 0) +++ crux-2.2/ports/opt/qemu/qemu-0.7.0-gcc4.patch 2006-03-30 14:11:17 UTC (rev 1076) @@ -0,0 +1,887 @@ +2005-06-02 Gwenole Beauchesne <gbeauchesne(a)mandriva.com> + + * dyngen.c (trace_i386_insn): Fix push/imul case with 8-bit + immediate. + +2005-05-11 Paul Brook <paul(a)codesourcery.com> + + * gcc4 host support. + +--- qemu-0.7.0/target-ppc/exec.h.gcc4 2005-04-27 22:52:05.000000000 +0200 ++++ qemu-0.7.0/target-ppc/exec.h 2005-06-02 21:41:51.000000000 +0200 +@@ -33,11 +33,7 @@ register uint32_t T2 asm(AREG3); + #define FT1 (env->ft1) + #define FT2 (env->ft2) + +-#if defined (DEBUG_OP) +-#define RETURN() __asm__ __volatile__("nop"); +-#else +-#define RETURN() __asm__ __volatile__(""); +-#endif ++#define RETURN() FORCE_RET() + + #include "cpu.h" + #include "exec-all.h" +--- qemu-0.7.0/dyngen-exec.h.gcc4 2005-04-27 22:52:05.000000000 +0200 ++++ qemu-0.7.0/dyngen-exec.h 2005-06-02 21:41:51.000000000 +0200 +@@ -155,7 +155,12 @@ extern int printf(const char *, ...); + #endif + + /* force GCC to generate only one epilog at the end of the function */ ++#if defined(__i386__) || defined(__x86_64__) ++/* Also add 4 bytes of padding so that we can replace the ret with a jmp. */ ++#define FORCE_RET() asm volatile ("nop;nop;nop;nop"); ++#else + #define FORCE_RET() asm volatile (""); ++#endif + + #ifndef OPPROTO + #define OPPROTO +@@ -205,12 +210,19 @@ extern int __op_jmp0, __op_jmp1, __op_jm + #endif + + #ifdef __i386__ +-#define EXIT_TB() asm volatile ("ret") +-#define GOTO_LABEL_PARAM(n) asm volatile ("jmp " ASM_NAME(__op_gen_label) #n) ++/* Dyngen will replace hlt instructions with a ret instruction. Inserting a ++ ret directly would confuse dyngen. */ ++#define EXIT_TB() asm volatile ("hlt") ++/* Dyngen will replace cli with 0x9e (jmp). ++ We generate the offset manually. */ ++#define GOTO_LABEL_PARAM(n) \ ++ asm volatile ("cli;.long " ASM_NAME(__op_gen_label) #n " - 1f;1:") + #endif + #ifdef __x86_64__ +-#define EXIT_TB() asm volatile ("ret") +-#define GOTO_LABEL_PARAM(n) asm volatile ("jmp " ASM_NAME(__op_gen_label) #n) ++/* The same as i386. */ ++#define EXIT_TB() asm volatile ("hlt") ++#define GOTO_LABEL_PARAM(n) \ ++ asm volatile ("cli;.long " ASM_NAME(__op_gen_label) #n " - 1f;1:") + #endif + #ifdef __powerpc__ + #define EXIT_TB() asm volatile ("blr") +--- qemu-0.7.0/dyngen.c.gcc4 2005-04-27 22:52:05.000000000 +0200 ++++ qemu-0.7.0/dyngen.c 2005-06-02 22:25:06.000000000 +0200 +@@ -32,6 +32,8 @@ + + #include "config-host.h" + ++//#define DEBUG_OP ++ + /* NOTE: we test CONFIG_WIN32 instead of _WIN32 to enabled cross + compilation */ + #if defined(CONFIG_WIN32) +@@ -1343,6 +1345,644 @@ int arm_emit_ldr_info(const char *name, + #endif + + ++#if defined(HOST_I386) || defined(HOST_X86_64) ++ ++/* This byte is the first byte of an instruction. */ ++#define FLAG_INSN (1 << 0) ++/* This byte has been processed as part of an instruction. */ ++#define FLAG_SCANNED (1 << 1) ++/* This instruction is a return instruction. Gcc cometimes generates prefix ++ bytes, so may be more than one byte long. */ ++#define FLAG_RET (1 << 2) ++/* This is either the target of a jump, or the preceeding instruction uses ++ a pc-relative offset. */ ++#define FLAG_TARGET (1 << 3) ++/* This is a magic instruction that needs fixing up. */ ++#define FLAG_EXIT (1 << 4) ++#define MAX_EXITS 5 ++ ++static void ++bad_opcode(const char *name, uint32_t op) ++{ ++ error("Unsupported opcode %0*x in %s", (op > 0xff) ? 4 : 2, op, name); ++} ++ ++/* Mark len bytes as scanned, Returns insn_size + len. Reports an error ++ if these bytes have already been scanned. */ ++static int ++eat_bytes(const char *name, char *flags, int insn, int insn_size, int len) ++{ ++ while (len > 0) { ++ /* This should never occur in sane code. */ ++ if (flags[insn + insn_size] & FLAG_SCANNED) ++ error ("Overlapping instructions in %s", name); ++ flags[insn + insn_size] |= FLAG_SCANNED; ++ insn_size++; ++ len--; ++ } ++ return insn_size; ++} ++ ++static void ++trace_i386_insn (const char *name, uint8_t *start_p, char *flags, int insn, ++ int len) ++{ ++ uint8_t *ptr; ++ uint8_t op; ++ int modrm; ++ int is_prefix; ++ int op_size; ++ int addr_size; ++ int insn_size; ++ int is_ret; ++ int is_condjmp; ++ int is_jmp; ++ int is_exit; ++ int is_pcrel; ++ int immed; ++ int seen_rexw; ++ int32_t disp; ++ ++ ptr = start_p + insn; ++ /* nonzero if this insn has a ModR/M byte. */ ++ modrm = 1; ++ /* The size of the immediate value in this instruction. */ ++ immed = 0; ++ /* The operand size. */ ++ op_size = 4; ++ /* The address size */ ++ addr_size = 4; ++ /* The total length of this instruction. */ ++ insn_size = 0; ++ is_prefix = 1; ++ is_ret = 0; ++ is_condjmp = 0; ++ is_jmp = 0; ++ is_exit = 0; ++ seen_rexw = 0; ++ is_pcrel = 0; ++ ++ while (is_prefix) { ++ op = ptr[insn_size]; ++ insn_size = eat_bytes(name, flags, insn, insn_size, 1); ++ is_prefix = 0; ++ switch (op >> 4) { ++ case 0: ++ case 1: ++ case 2: ++ case 3: ++ if (op == 0x0f) { ++ /* two-byte opcode. */ ++ op = ptr[insn_size]; ++ insn_size = eat_bytes(name, flags, insn, insn_size, 1); ++ switch (op >> 4) { ++ case 0: ++ if ((op & 0xf) > 3) ++ modrm = 0; ++ break; ++ case 1: /* vector move or prefetch */ ++ case 2: /* various moves and vector compares. */ ++ case 4: /* cmov */ ++ case 5: /* vector instructions */ ++ case 6: ++ case 13: ++ case 14: ++ case 15: ++ break; ++ case 7: /* mmx */ ++ if (op & 0x77) /* emms */ ++ modrm = 0; ++ break; ++ case 3: /* wrmsr, rdtsc, rdmsr, rdpmc, sysenter, sysexit */ ++ modrm = 0; ++ break; ++ case 8: /* long conditional jump */ ++ is_condjmp = 1; ++ immed = op_size; ++ modrm = 0; ++ break; ++ case 9: /* setcc */ ++ break; ++ case 10: ++ switch (op & 0x7) { ++ case 0: /* push fs/gs */ ++ case 1: /* pop fs/gs */ ++ case 2: /* cpuid/rsm */ ++ modrm = 0; ++ break; ++ case 4: /* shld/shrd immediate */ ++ immed = 1; ++ break; ++ default: /* Normal instructions with a ModR/M byte. */ ++ break; ++ } ++ break; ++ case 11: ++ switch (op & 0xf) { ++ case 10: /* bt, bts, btr, btc */ ++ immed = 1; ++ break; ++ default: ++ /* cmpxchg, lss, btr, lfs, lgs, movzx, btc, bsf, bsr ++ undefined, and movsx */ ++ break; ++ } ++ break; ++ case 12: ++ if (op & 8) { ++ /* bswap */ ++ modrm = 0; ++ } else { ++ switch (op & 0x7) { ++ case 2: ++ case 4: ++ case 5: ++ case 6: ++ immed = 1; ++ break; ++ default: ++ break; ++ } ++ } ++ break; ++ } ++ } else if ((op & 0x07) <= 0x3) { ++ /* General arithmentic ax. */ ++ } else if ((op & 0x07) <= 0x5) { ++ /* General arithmetic ax, immediate. */ ++ if (op & 0x01) ++ immed = op_size; ++ else ++ immed = 1; ++ modrm = 0; ++ } else if ((op & 0x23) == 0x22) { ++ /* Segment prefix. */ ++ is_prefix = 1; ++ } else { ++ /* Segment register push/pop or DAA/AAA/DAS/AAS. */ ++ modrm = 0; ++ } ++ break; ++ ++#if defined(HOST_X86_64) ++ case 4: /* rex prefix. */ ++ is_prefix = 1; ++ /* The address/operand size is actually 64-bit, but the immediate ++ values in the instruction are still 32-bit. */ ++ op_size = 4; ++ addr_size = 4; ++ if (op & 8) ++ seen_rexw = 1; ++ break; ++#else ++ case 4: /* inc/dec register. */ ++#endif ++ case 5: /* push/pop general register. */ ++ modrm = 0; ++ break; ++ ++ case 6: ++ switch (op & 0x0f) { ++ case 0: /* pusha */ ++ case 1: /* popa */ ++ modrm = 0; ++ break; ++ case 2: /* bound */ ++ case 3: /* arpl */ ++ break; ++ case 4: /* FS */ ++ case 5: /* GS */ ++ is_prefix = 1; ++ break; ++ case 6: /* opcode size prefix. */ ++ op_size = 2; ++ is_prefix = 1; ++ break; ++ case 7: /* Address size prefix. */ ++ addr_size = 2; ++ is_prefix = 1; ++ break; ++ case 8: /* push immediate */ ++ immed = op_size; ++ modrm = 0; ++ break; ++ case 10: /* push 8-bit immediate */ ++ immed = 1; ++ modrm = 0; ++ break; ++ case 9: /* imul immediate */ ++ immed = op_size; ++ break; ++ case 11: /* imul 8-bit immediate */ ++ immed = 1; ++ break; ++ case 12: /* insb */ ++ case 13: /* insw */ ++ case 14: /* outsb */ ++ case 15: /* outsw */ ++ modrm = 0; ++ break; ++ } ++ break; ++ ++ case 7: /* Short conditional jump. */ ++ is_condjmp = 1; ++ immed = 1; ++ modrm = 0; ++ break; ++ ++ case 8: ++ if ((op & 0xf) <= 3) { ++ /* arithmetic immediate. */ ++ if ((op & 3) == 1) ++ immed = op_size; ++ else ++ immed = 1; ++ } ++ /* else test, xchg, mov, lea or pop general. */ ++ break; ++ ++ case 9: ++ /* Various single-byte opcodes with no modrm byte. */ ++ modrm = 0; ++ if (op == 10) { ++ /* Call */ ++ immed = 4; ++ } ++ break; ++ ++ case 10: ++ switch ((op & 0xe) >> 1) { ++ case 0: /* mov absoliute immediate. */ ++ case 1: ++ if (seen_rexw) ++ immed = 8; ++ else ++ immed = addr_size; ++ break; ++ case 4: /* test immediate. */ ++ if (op & 1) ++ immed = op_size; ++ else ++ immed = 1; ++ break; ++ default: /* Various string ops. */ ++ break; ++ } ++ modrm = 0; ++ break; ++ ++ case 11: /* move immediate to register */ ++ if (op & 8) { ++ if (seen_rexw) ++ immed = 8; ++ else ++ immed = op_size; ++ } else { ++ immed = 1; ++ } ++ modrm = 0; ++ break; ++ ++ case 12: ++ switch (op & 0xf) { ++ case 0: /* shift immediate */ ++ case 1: ++ immed = 1; ++ break; ++ case 2: /* ret immediate */ ++ immed = 2; ++ modrm = 0; ++ bad_opcode(name, op); ++ break; ++ case 3: /* ret */ ++ modrm = 0; ++ is_ret = 1; ++ case 4: /* les */ ++ case 5: /* lds */ ++ break; ++ case 6: /* mov immediate byte */ ++ immed = 1; ++ break; ++ case 7: /* mov immediate */ ++ immed = op_size; ++ break; ++ case 8: /* enter */ ++ /* TODO: Is this right? */ ++ immed = 3; ++ modrm = 0; ++ break; ++ case 10: /* retf immediate */ ++ immed = 2; ++ modrm = 0; ++ bad_opcode(name, op); ++ break; ++ case 13: /* int */ ++ immed = 1; ++ modrm = 0; ++ break; ++ case 11: /* retf */ ++ case 15: /* iret */ ++ modrm = 0; ++ bad_opcode(name, op); ++ break; ++ default: /* leave, int3 or into */ ++ modrm = 0; ++ break; ++ } ++ break; ++ ++ case 13: ++ if ((op & 0xf) >= 8) { ++ /* Coprocessor escape. For our purposes this is just a normal ++ instruction with a ModR/M byte. */ ++ } else if ((op & 0xf) >= 4) { ++ /* AAM, AAD or XLAT */ ++ modrm = 0; ++ } ++ /* else shift instruction */ ++ break; ++ ++ case 14: ++ switch ((op & 0xc) >> 2) { ++ case 0: /* loop or jcxz */ ++ is_condjmp = 1; ++ immed = 1; ++ break; ++ case 1: /* in/out immed */ ++ immed = 1; ++ break; ++ case 2: /* call or jmp */ ++ switch (op & 3) { ++ case 0: /* call */ ++ immed = op_size; ++ break; ++ case 1: /* long jump */ ++ immed = 4; ++ is_jmp = 1; ++ break; ++ case 2: /* far jmp */ ++ bad_opcode(name, op); ++ break; ++ case 3: /* short jmp */ ++ immed = 1; ++ is_jmp = 1; ++ break; ++ } ++ break; ++ case 3: /* in/out register */ ++ break; ++ } ++ modrm = 0; ++ break; ++ ++ case 15: ++ switch ((op & 0xe) >> 1) { ++ case 0: ++ case 1: ++ is_prefix = 1; ++ break; ++ case 2: ++ case 4: ++ case 5: ++ case 6: ++ modrm = 0; ++ /* Some privileged insns are used as markers. */ ++ switch (op) { ++ case 0xf4: /* hlt: Exit translation block. */ ++ is_exit = 1; ++ break; ++ case 0xfa: /* cli: Jump to label. */ ++ is_exit = 1; ++ immed = 4; ++ break; ++ case 0xfb: /* sti: TB patch jump. */ ++ /* Mark the insn for patching, but continue sscanning. */ ++ flags[insn] |= FLAG_EXIT; ++ immed = 4; ++ break; ++ } ++ break; ++ case 3: /* unary grp3 */ ++ if ((ptr[insn_size] & 0x38) == 0) { ++ if (op == 0xf7) ++ immed = op_size; ++ else ++ immed = 1; /* test immediate */ ++ } ++ break; ++ case 7: /* inc/dec grp4/5 */ ++ /* TODO: This includes indirect jumps. We should fail if we ++ encounter one of these. */ ++ break; ++ } ++ break; ++ } ++ } ++ ++ if (modrm) { ++ if (addr_size != 4) ++ error("16-bit addressing mode used in %s", name); ++ ++ disp = 0; ++ modrm = ptr[insn_size]; ++ insn_size = eat_bytes(name, flags, insn, insn_size, 1); ++ modrm &= 0xc7; ++ switch ((modrm & 0xc0) >> 6) { ++ case 0: ++ if (modrm == 5) ++ disp = 4; ++ break; ++ case 1: ++ disp = 1; ++ break; ++ case 2: ++ disp = 4; ++ break; ++ } ++ if ((modrm & 0xc0) != 0xc0 && (modrm & 0x7) == 4) { ++ /* SIB byte */ ++ if (modrm == 4 && (ptr[insn_size] & 0x7) == 5) { ++ disp = 4; ++ is_pcrel = 1; ++ } ++ insn_size = eat_bytes(name, flags, insn, insn_size, 1); ++ } ++ insn_size = eat_bytes(name, flags, insn, insn_size, disp); ++ } ++ insn_size = eat_bytes(name, flags, insn, insn_size, immed); ++ if (is_condjmp || is_jmp) { ++ if (immed == 1) { ++ disp = (int8_t)*(ptr + insn_size - 1); ++ } else { ++ disp = (((int32_t)*(ptr + insn_size - 1)) << 24) ++ | (((int32_t)*(ptr + insn_size - 2)) << 16) ++ | (((int32_t)*(ptr + insn_size - 3)) << 8) ++ | *(ptr + insn_size - 4); ++ } ++ disp += insn_size; ++ /* Jumps to external symbols point to the address of the offset ++ before relocation. */ ++ /* ??? These are probably a tailcall. We could fix them up by ++ replacing them with jmp to EOB + call, but it's easier to just ++ prevent the compiler generating them. */ ++ if (disp == 1) ++ error("Unconditional jump (sibcall?) in %s", name); ++ disp += insn; ++ if (disp < 0 || disp > len) ++ error("Jump outside instruction in %s", name); ++ ++ if ((flags[disp] & (FLAG_INSN | FLAG_SCANNED)) == FLAG_SCANNED) ++ error("Overlapping instructions in %s", name); ++ ++ flags[disp] |= (FLAG_INSN | FLAG_TARGET); ++ is_pcrel = 1; ++ } ++ if (is_pcrel) { ++ /* Mark the following insn as a jump target. This will stop ++ this instruction being moved. */ ++ flags[insn + insn_size] |= FLAG_TARGET; ++ } ++ if (is_ret) ++ flags[insn] |= FLAG_RET; ++ ++ if (is_exit) ++ flags[insn] |= FLAG_EXIT; ++ ++ if (!(is_jmp || is_ret || is_exit)) ++ flags[insn + insn_size] |= FLAG_INSN; ++} ++ ++/* Scan a function body. Returns the position of the return sequence. ++ Sets *patch_bytes to the number of bytes that need to be copied from that ++ location. If no patching is required (ie. the return is the last insn) ++ *patch_bytes will be set to -1. *plen is the number of code bytes to copy. ++ */ ++static int trace_i386_op(const char * name, uint8_t *start_p, int *plen, ++ int *patch_bytes, int *exit_addrs) ++{ ++ char *flags; ++ int more; ++ int insn; ++ int retpos; ++ int bytes; ++ int num_exits; ++ int len; ++ int last_insn; ++ ++ len = *plen; ++ flags = malloc(len + 1); ++ memset(flags, 0, len + 1); ++ flags[0] |= FLAG_INSN; ++ more = 1; ++ while (more) { ++ more = 0; ++ for (insn = 0; insn < len; insn++) { ++ if ((flags[insn] & (FLAG_INSN | FLAG_SCANNED)) == FLAG_INSN) { ++ trace_i386_insn(name, start_p, flags, insn, len); ++ more = 1; ++ } ++ } ++ } ++ ++ /* Strip any unused code at the end of the function. */ ++ while (len > 0 && flags[len - 1] == 0) ++ len--; ++ ++ retpos = -1; ++ num_exits = 0; ++ last_insn = 0; ++ for (insn = 0; insn < len; insn++) { ++ if (flags[insn] & FLAG_RET) { ++ /* ??? In theory it should be possible to handle multiple return ++ points. In practice it's not worth the effort. */ ++ if (retpos != -1) ++ error("Multiple return instructions in %s", name); ++ retpos = insn; ++ } ++ if (flags[insn] & FLAG_EXIT) { ++ if (num_exits == MAX_EXITS) ++ error("Too many block exits in %s", name); ++ exit_addrs[num_exits] = insn; ++ num_exits++; ++ } ++ if (flags[insn] & FLAG_INSN) ++ last_insn = insn; ++ } ++ ++ exit_addrs[num_exits] = -1; ++ if (retpos == -1) { ++ if (num_exits == 0) { ++ error ("No return instruction found in %s", name); ++ } else { ++ retpos = len; ++ last_insn = len; ++ } ++ } ++ ++ /* If the return instruction is the last instruction we can just ++ remove it. */ ++ if (retpos == last_insn) ++ *patch_bytes = -1; ++ else ++ *patch_bytes = 0; ++ ++ /* Back up over any nop instructions. */ ++ while (retpos > 0 ++ && (flags[retpos] & FLAG_TARGET) == 0 ++ && (flags[retpos - 1] & FLAG_INSN) != 0 ++ && start_p[retpos - 1] == 0x90) { ++ retpos--; ++ } ++ ++ if (*patch_bytes == -1) { ++ *plen = retpos; ++ free (flags); ++ return retpos; ++ } ++ *plen = len; ++ ++ /* The ret is in the middle of the function. Find four more bytes that ++ so the ret can be replaced by a jmp. */ ++ /* ??? Use a short jump where possible. */ ++ bytes = 4; ++ insn = retpos + 1; ++ /* We can clobber everything up to the next jump target. */ ++ while (insn < len && bytes > 0 && (flags[insn] & FLAG_TARGET) == 0) { ++ insn++; ++ bytes--; ++ } ++ if (bytes > 0) { ++ /* ???: Strip out nop blocks. */ ++ /* We can't do the replacement without clobbering anything important. ++ Copy preceeding instructions(s) to give us some space. */ ++ while (retpos > 0) { ++ /* If this byte is the target of a jmp we can't move it. */ ++ if (flags[retpos] & FLAG_TARGET) ++ break; ++ ++ (*patch_bytes)++; ++ bytes--; ++ retpos--; ++ ++ /* Break out of the loop if we have enough space and this is either ++ the first byte of an instruction or a pad byte. */ ++ if ((flags[retpos] & (FLAG_INSN | FLAG_SCANNED)) != FLAG_SCANNED ++ && bytes <= 0) { ++ break; ++ } ++ } ++ } ++ ++ if (bytes > 0) ++ error("Unable to replace ret with jmp in %s\n", name); ++ ++ free(flags); ++ return retpos; ++} ++ ++#endif ++ + #define MAX_ARGS 3 + + /* generate op code */ +@@ -1356,6 +1996,11 @@ void gen_code(const char *name, host_ulo + uint8_t args_present[MAX_ARGS]; + const char *sym_name, *p; + EXE_RELOC *rel; ++#if defined(HOST_I386) || defined(HOST_X86_64) ++ int patch_bytes; ++ int retpos; ++ int exit_addrs[MAX_EXITS]; ++#endif + + /* Compute exact size excluding prologue and epilogue instructions. + * Increment start_offset to skip epilogue instructions, then compute +@@ -1366,33 +2011,12 @@ void gen_code(const char *name, host_ulo + p_end = p_start + size; + start_offset = offset; + #if defined(HOST_I386) || defined(HOST_X86_64) +-#ifdef CONFIG_FORMAT_COFF +- { +- uint8_t *p; +- p = p_end - 1; +- if (p == p_start) +- error("empty code for %s", name); +- while (*p != 0xc3) { +- p--; +- if (p <= p_start) +- error("ret or jmp expected at the end of %s", name); +- } +- copy_size = p - p_start; +- } +-#else + { + int len; + len = p_end - p_start; +- if (len == 0) +- error("empty code for %s", name); +- if (p_end[-1] == 0xc3) { +- len--; +- } else { +- error("ret or jmp expected at the end of %s", name); +- } ++ retpos = trace_i386_op(name, p_start, &len, &patch_bytes, exit_addrs); + copy_size = len; + } +-#endif + #elif defined(HOST_PPC) + { + uint8_t *p; +@@ -1559,6 +2183,13 @@ void gen_code(const char *name, host_ulo + } + + if (gen_switch == 2) { ++#if defined(HOST_I386) || defined(HOST_X86_64) ++ if (patch_bytes != -1) ++ copy_size += patch_bytes; ++#ifdef DEBUG_OP ++ copy_size += 2; ++#endif ++#endif + fprintf(outfile, "DEF(%s, %d, %d)\n", name + 3, nb_args, copy_size); + } else if (gen_switch == 1) { + +@@ -1761,7 +2392,43 @@ void gen_code(const char *name, host_ulo + #error unsupport object format + #endif + } ++ } ++ /* Replace the marker instructions with the actual opcodes. */ ++ for (i = 0; exit_addrs[i] != -1; i++) { ++ int op; ++ switch (p_start[exit_addrs[i]]) ++ { ++ case 0xf4: op = 0xc3; break; /* hlt -> ret */ ++ case 0xfa: op = 0xe9; break; /* cli -> jmp */ ++ case 0xfb: op = 0xe9; break; /* sti -> jmp */ ++ default: error("Internal error"); ++ } ++ fprintf(outfile, ++ " *(uint8_t *)(gen_code_ptr + %d) = 0x%x;\n", ++ exit_addrs[i], op); + } ++ /* Fix up the return instruction. */ ++ if (patch_bytes != -1) { ++ if (patch_bytes) { ++ fprintf(outfile, " memcpy(gen_code_ptr + %d," ++ "gen_code_ptr + %d, %d);\n", ++ copy_size, retpos, patch_bytes); ++ } ++ fprintf(outfile, ++ " *(uint8_t *)(gen_code_ptr + %d) = 0xe9;\n", ++ retpos); ++ fprintf(outfile, ++ " *(uint32_t *)(gen_code_ptr + %d) = 0x%x;\n", ++ retpos + 1, copy_size - (retpos + 5)); ++ ++ copy_size += patch_bytes; ++ } ++#ifdef DEBUG_OP ++ fprintf(outfile, ++ " *(uint16_t *)(gen_code_ptr + %d) = 0x9090;\n", ++ copy_size); ++ copy_size += 2; ++#endif + } + #elif defined(HOST_X86_64) + { +@@ -1793,6 +2460,42 @@ void gen_code(const char *name, host_ulo + } + } + } ++ /* Replace the marker instructions with the actual opcodes. */ ++ for (i = 0; exit_addrs[i] != -1; i++) { ++ int op; ++ switch (p_start[exit_addrs[i]]) ++ { ++ case 0xf4: op = 0xc3; break; /* hlt -> ret */ ++ case 0xfa: op = 0xe9; break; /* cli -> jmp */ ++ case 0xfb: op = 0xe9; break; /* sti -> jmp */ ++ default: error("Internal error"); ++ } ++ fprintf(outfile, ++ " *(uint8_t *)(gen_code_ptr + %d) = 0x%x;\n", ++ exit_addrs[i], op); ++ } ++ /* Fix up the return instruction. */ ++ if (patch_bytes != -1) { ++ if (patch_bytes) { ++ fprintf(outfile, " memcpy(gen_code_ptr + %d," ++ "gen_code_ptr + %d, %d);\n", ++ copy_size, retpos, patch_bytes); ++ } ++ fprintf(outfile, ++ " *(uint8_t *)(gen_code_ptr + %d) = 0xe9;\n", ++ retpos); ++ fprintf(outfile, ++ " *(uint32_t *)(gen_code_ptr + %d) = 0x%x;\n", ++ retpos + 1, copy_size - (retpos + 5)); ++ ++ copy_size += patch_bytes; ++ } ++#ifdef DEBUG_OP ++ fprintf(outfile, ++ " *(uint16_t *)(gen_code_ptr + %d) = 0x9090;\n", ++ copy_size); ++ copy_size += 2; ++#endif + } + #elif defined(HOST_PPC) + { +--- qemu-0.7.0/exec-all.h.gcc4 2005-04-27 22:52:05.000000000 +0200 ++++ qemu-0.7.0/exec-all.h 2005-06-02 21:41:51.000000000 +0200 +@@ -335,14 +335,15 @@ do {\ + + #elif defined(__i386__) && defined(USE_DIRECT_JUMP) + +-/* we patch the jump instruction directly */ ++/* we patch the jump instruction directly. Use sti in place of the actual ++ jmp instruction so that dyngen can patch in the correct result. */ + #define GOTO_TB(opname, tbparam, n)\ + do {\ + asm volatile (".section .data\n"\ + ASM_OP_LABEL_NAME(n, opname) ":\n"\ + ".long 1f\n"\ + ASM_PREVIOUS_SECTION \ +- "jmp " ASM_NAME(__op_jmp) #n "\n"\ ++ "sti;.long " ASM_NAME(__op_jmp) #n " - 1f\n"\ + "1:\n");\ + } while (0) + Added: crux-2.2/ports/opt/qemu/qemu-0.7.2-dyngen-check-stack-clobbers.patch =================================================================== --- crux-2.2/ports/opt/qemu/qemu-0.7.2-dyngen-check-stack-clobbers.patch (rev 0) +++ crux-2.2/ports/opt/qemu/qemu-0.7.2-dyngen-check-stack-clobbers.patch 2006-03-30 14:11:17 UTC (rev 1076) @@ -0,0 +1,137 @@ +2005-11-11 Gwenole Beauchesne <gbeauchesne(a)mandriva.com> + + * Check for stack clobbers in functions using GOTO_LABEL_PARAM(). + +--- qemu-0.7.2/dyngen.c.dyngen-check-stack-clobbers 2005-11-11 16:26:33.000000000 +0100 ++++ qemu-0.7.2/dyngen.c 2005-11-11 17:30:29.000000000 +0100 +@@ -1414,6 +1414,9 @@ int arm_emit_ldr_info(const char *name, + #define FLAG_TARGET (1 << 3) + /* This is a magic instruction that needs fixing up. */ + #define FLAG_EXIT (1 << 4) ++/* This instruction clobbers the stack pointer. */ ++/* XXX only supports push, pop, add/sub $imm,%esp */ ++#define FLAG_STACK (1 << 5) + #define MAX_EXITS 5 + + static void +@@ -1454,6 +1457,7 @@ trace_i386_insn (const char *name, uint8 + int is_jmp; + int is_exit; + int is_pcrel; ++ int is_stack; + int immed; + int seen_rexw; + int32_t disp; +@@ -1476,6 +1480,7 @@ trace_i386_insn (const char *name, uint8 + is_exit = 0; + seen_rexw = 0; + is_pcrel = 0; ++ is_stack = 0; + + while (is_prefix) { + op = ptr[insn_size]; +@@ -1522,6 +1527,7 @@ trace_i386_insn (const char *name, uint8 + switch (op & 0x7) { + case 0: /* push fs/gs */ + case 1: /* pop fs/gs */ ++ is_stack = 1; + case 2: /* cpuid/rsm */ + modrm = 0; + break; +@@ -1594,6 +1600,7 @@ trace_i386_insn (const char *name, uint8 + #endif + case 5: /* push/pop general register. */ + modrm = 0; ++ is_stack = 1; + break; + + case 6: +@@ -1601,6 +1608,7 @@ trace_i386_insn (const char *name, uint8 + case 0: /* pusha */ + case 1: /* popa */ + modrm = 0; ++ is_stack = 1; + break; + case 2: /* bound */ + case 3: /* arpl */ +@@ -1620,10 +1628,12 @@ trace_i386_insn (const char *name, uint8 + case 8: /* push immediate */ + immed = op_size; + modrm = 0; ++ is_stack = 1; + break; + case 10: /* push 8-bit immediate */ + immed = 1; + modrm = 0; ++ is_stack = 1; + break; + case 9: /* imul immediate */ + immed = op_size; +@@ -1653,8 +1663,22 @@ trace_i386_insn (const char *name, uint8 + immed = op_size; + else + immed = 1; ++ if (op == 0x81 || op == 0x83) { ++ /* add, sub */ ++ op = ptr[insn_size]; ++ switch ((op >> 3) & 7) { ++ case 0: ++ case 5: ++ is_stack = (op & 7) == 4; ++ break; ++ } ++ } + } +- /* else test, xchg, mov, lea or pop general. */ ++ else if ((op & 0xf) == 0xf) { ++ /* pop general. */ ++ is_stack = 1; ++ } ++ /* else test, xchg, mov, lea. */ + break; + + case 9: +@@ -1904,6 +1928,9 @@ trace_i386_insn (const char *name, uint8 + if (is_exit) + flags[insn] |= FLAG_EXIT; + ++ if (is_stack) ++ flags[insn] |= FLAG_STACK; ++ + if (!(is_jmp || is_ret || is_exit)) + flags[insn + insn_size] |= FLAG_INSN; + } +@@ -1924,6 +1951,7 @@ static int trace_i386_op(const char * na + int num_exits; + int len; + int last_insn; ++ int stack_clobbered; + + len = *plen; + flags = malloc(len + 1); +@@ -1947,6 +1975,7 @@ static int trace_i386_op(const char * na + retpos = -1; + num_exits = 0; + last_insn = 0; ++ stack_clobbered = 0; + for (insn = 0; insn < len; insn++) { + if (flags[insn] & FLAG_RET) { + /* ??? In theory it should be possible to handle multiple return +@@ -1956,6 +1985,8 @@ static int trace_i386_op(const char * na + retpos = insn; + } + if (flags[insn] & FLAG_EXIT) { ++ if (stack_clobbered) ++ error("Stack clobbered in %s", name); + if (num_exits == MAX_EXITS) + error("Too many block exits in %s", name); + exit_addrs[num_exits] = insn; +@@ -1963,6 +1994,8 @@ static int trace_i386_op(const char * na + } + if (flags[insn] & FLAG_INSN) + last_insn = insn; ++ if (flags[insn] & FLAG_STACK) ++ stack_clobbered = 1; + } + + exit_addrs[num_exits] = -1; Added: crux-2.2/ports/opt/qemu/qemu-0.7.2-gcc4-opts.patch =================================================================== --- crux-2.2/ports/opt/qemu/qemu-0.7.2-gcc4-opts.patch (rev 0) +++ crux-2.2/ports/opt/qemu/qemu-0.7.2-gcc4-opts.patch 2006-03-30 14:11:17 UTC (rev 1076) @@ -0,0 +1,37 @@ +2005-11-11 Gwenole Beauchesne <gbeauchesne(a)mandriva.com> + + * Globaaly save %ebx, %esi, %edi on entry to generated + function. This avoids some register spills in synthetic opcodes. + NOTE: this also easily fixes gcc4 compiled qemu-system-x86_64 on x86. + +--- qemu-0.7.2/cpu-exec.c.gcc4-opts 2005-09-04 19:11:31.000000000 +0200 ++++ qemu-0.7.2/cpu-exec.c 2005-11-11 17:40:47.000000000 +0100 +@@ -561,6 +561,15 @@ int cpu_exec(CPUState *env1) + : /* no outputs */ + : "r" (gen_func) + : "r1", "r2", "r3", "r8", "r9", "r10", "r12", "r14"); ++#elif defined(TARGET_X86_64) && defined(__i386__) ++ asm volatile ("push %%ebx\n" ++ "push %%esi\n" ++ "push %%edi\n" ++ "call *%0\n" ++ "pop %%edi\n" ++ "pop %%esi\n" ++ "pop %%ebx\n" ++ : : "r" (gen_func) : "ebx", "esi", "edi"); + #elif defined(TARGET_I386) && defined(USE_CODE_COPY) + { + if (!(tb->cflags & CF_CODE_COPY)) { +--- qemu-0.7.2/Makefile.target.gcc4-opts 2005-11-11 16:26:33.000000000 +0100 ++++ qemu-0.7.2/Makefile.target 2005-11-11 17:59:56.000000000 +0100 +@@ -65,6 +65,10 @@ OP_CFLAGS+= -falign-functions=0 -fno-gcs + else + OP_CFLAGS+= -malign-functions=0 + endif ++ifeq ($(TARGET_ARCH), x86_64) ++# XXX globally save %ebx, %esi, %edi on entry to generated function ++OP_CFLAGS+= -fcall-used-ebx -fcall-used-esi -fcall-used-edi ++endif + + ifdef TARGET_GPROF + USE_I386_LD=y Added: crux-2.2/ports/opt/qemu/qemu-0.8.0-gcc4-hacks.patch =================================================================== --- crux-2.2/ports/opt/qemu/qemu-0.8.0-gcc4-hacks.patch (rev 0) +++ crux-2.2/ports/opt/qemu/qemu-0.8.0-gcc4-hacks.patch 2006-03-30 14:11:17 UTC (rev 1076) @@ -0,0 +1,118 @@ +2005-10-28 Gwenole Beauchesne <gbeauchesne(a)mandriva.com> + + * Various additional hacks for GCC4. + +--- qemu-0.7.2/target-i386/ops_sse.h.gcc4-hacks 2005-09-04 19:11:31.000000000 +0200 ++++ qemu-0.7.2/target-i386/ops_sse.h 2005-10-28 10:09:21.000000000 +0200 +@@ -34,6 +34,12 @@ + #define Q(n) XMM_Q(n) + #define SUFFIX _xmm + #endif ++#if defined(__i386__) && __GNUC__ >= 4 ++#define RegCopy(d, s) __builtin_memcpy(&(d), &(s), sizeof(d)) ++#endif ++#ifndef RegCopy ++#define RegCopy(d, s) d = s ++#endif + + void OPPROTO glue(op_psrlw, SUFFIX)(void) + { +@@ -570,7 +576,7 @@ void OPPROTO glue(op_pshufw, SUFFIX) (vo + r.W(1) = s->W((order >> 2) & 3); + r.W(2) = s->W((order >> 4) & 3); + r.W(3) = s->W((order >> 6) & 3); +- *d = r; ++ RegCopy(*d, r); + } + #else + void OPPROTO op_shufps(void) +--- qemu-0.7.2/target-i386/helper.c.gcc4-hacks 2005-09-04 19:11:31.000000000 +0200 ++++ qemu-0.7.2/target-i386/helper.c 2005-10-28 10:09:21.000000000 +0200 +@@ -3130,8 +3130,15 @@ void helper_fxrstor(target_ulong ptr, in + nb_xmm_regs = 8 << data64; + addr = ptr + 0xa0; + for(i = 0; i < nb_xmm_regs; i++) { ++#if defined(__i386__) && __GNUC__ >= 4 ++ env->xmm_regs[i].XMM_L(0) = ldl(addr); ++ env->xmm_regs[i].XMM_L(1) = ldl(addr + 4); ++ env->xmm_regs[i].XMM_L(2) = ldl(addr + 8); ++ env->xmm_regs[i].XMM_L(3) = ldl(addr + 12); ++#else + env->xmm_regs[i].XMM_Q(0) = ldq(addr); + env->xmm_regs[i].XMM_Q(1) = ldq(addr + 8); ++#endif + addr += 16; + } + } +--- qemu-0.7.2/cpu-all.h.gcc4-hacks 2005-09-04 19:11:31.000000000 +0200 ++++ qemu-0.7.2/cpu-all.h 2005-10-28 10:09:21.000000000 +0200 +@@ -339,7 +339,13 @@ + + static inline void stq_le_p(void *ptr, uint64_t v) + { ++#if defined(__i386__) && __GNUC__ >= 4 ++ const union { uint64_t v; uint32_t p[2]; } x = { .v = v }; ++ ((uint32_t *)ptr)[0] = x.p[0]; ++ ((uint32_t *)ptr)[1] = x.p[1]; ++#else + *(uint64_t *)ptr = v; ++#endif + } + + /* float access */ +--- qemu-0.7.2/softmmu_header.h.gcc4-hacks 2005-10-28 10:08:08.000000000 +0200 ++++ qemu-0.7.2/softmmu_header.h 2005-10-28 10:09:21.000000000 +0200 +@@ -104,7 +104,7 @@ + void REGPARM(2) glue(glue(__st, SUFFIX), MMUSUFFIX)(target_ulong addr, DATA_TYPE v, int is_user); + + #if (DATA_SIZE <= 4) && (TARGET_LONG_BITS == 32) && defined(__i386__) && \ +- (ACCESS_TYPE <= 1) && defined(ASM_SOFTMMU) ++ (ACCESS_TYPE <= 1) && defined(ASM_SOFTMMU) && (__GNUC__ < 4) + + #define CPU_TLB_ENTRY_BITS 4 + +@@ -131,7 +131,7 @@ static inline RES_TYPE glue(glue(ld, USU + "m" (*(uint32_t *)offsetof(CPUState, tlb_read[CPU_MEM_INDEX][0].address)), + "i" (CPU_MEM_INDEX), + "m" (*(uint8_t *)&glue(glue(__ld, SUFFIX), MMUSUFFIX)) +- : "%eax", "%ecx", "%edx", "memory", "cc"); ++ : "%eax", "%edx", "memory", "cc"); + return res; + } + +@@ -178,13 +178,14 @@ static inline int glue(glue(lds, SUFFIX) + "m" (*(uint32_t *)offsetof(CPUState, tlb_read[CPU_MEM_INDEX][0].address)), + "i" (CPU_MEM_INDEX), + "m" (*(uint8_t *)&glue(glue(__ld, SUFFIX), MMUSUFFIX)) +- : "%eax", "%ecx", "%edx", "memory", "cc"); ++ : "%eax", "%edx", "memory", "cc"); + return res; + } + #endif + +-static inline void glue(glue(st, SUFFIX), MEMSUFFIX)(target_ulong ptr, RES_TYPE v) ++static inline void glue(glue(st, SUFFIX), MEMSUFFIX)(target_ulong ptr, RES_TYPE val) + { ++ RES_TYPE v = val; + asm volatile ("movl %0, %%edx\n" + "movl %0, %%eax\n" + "shrl %3, %%edx\n" +@@ -236,16 +237,14 @@ + "2:\n" + : + : "r" (ptr), +-/* NOTE: 'q' would be needed as constraint, but we could not use it +- with T1 ! */ +- "r" (v), ++ "q" (v), + "i" ((CPU_TLB_SIZE - 1) << CPU_TLB_ENTRY_BITS), + "i" (TARGET_PAGE_BITS - CPU_TLB_ENTRY_BITS), + "i" (TARGET_PAGE_MASK | (DATA_SIZE - 1)), + "m" (*(uint32_t *)offsetof(CPUState, tlb_table[CPU_MEM_INDEX][0].addr_write)), + "i" (CPU_MEM_INDEX), + "m" (*(uint8_t *)&glue(glue(__st, SUFFIX), MMUSUFFIX)) +- : "%eax", "%ecx", "%edx", "memory", "cc"); ++ : "%eax", "%edx", "memory", "cc"); + } + + /* TODO: handle 64-bit access sizes and addresses */

1 0

r1075 - crux-2.2/ports/opt/imagemagick
by crux＠crux.nu 30 Mar '06

30 Mar '06

Author: sip Date: 2006-03-30 15:34:05 +0200 (Thu, 30 Mar 2006) New Revision: 1075 Modified: crux-2.2/ports/opt/imagemagick/Pkgfile Log: imagemagick: bumped release Modified: crux-2.2/ports/opt/imagemagick/Pkgfile =================================================================== --- crux-2.2/ports/opt/imagemagick/Pkgfile 2006-03-30 13:30:50 UTC (rev 1074) +++ crux-2.2/ports/opt/imagemagick/Pkgfile 2006-03-30 13:34:05 UTC (rev 1075) @@ -6,7 +6,7 @@ name=imagemagick version=6.2.6 -release=1 +release=3 source=(http://dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-$vers… build () {

1 0