May 2006 - crux-commits - lists.crux.nu

r1458 - crux-2.2/ports/opt/gtklp
by crux＠crux.nu 31 May '06

31 May '06

Author: sip Date: 2006-05-31 20:26:27 +0200 (Wed, 31 May 2006) New Revision: 1458 Modified: crux-2.2/ports/opt/gtklp/.md5sum crux-2.2/ports/opt/gtklp/Pkgfile Log: gtklp: updated to 1.2.2 Modified: crux-2.2/ports/opt/gtklp/.md5sum =================================================================== --- crux-2.2/ports/opt/gtklp/.md5sum 2006-05-30 14:36:34 UTC (rev 1457) +++ crux-2.2/ports/opt/gtklp/.md5sum 2006-05-31 18:26:27 UTC (rev 1458) @@ -1 +1 @@ -374501229e7d1bd9c7f211fc50c51fd5 gtklp-1.2.1.src.tar.gz +f07a6acee4cf4d95559a7740661bcbe9 gtklp-1.2.2.src.tar.gz Modified: crux-2.2/ports/opt/gtklp/Pkgfile =================================================================== --- crux-2.2/ports/opt/gtklp/Pkgfile 2006-05-30 14:36:34 UTC (rev 1457) +++ crux-2.2/ports/opt/gtklp/Pkgfile 2006-05-31 18:26:27 UTC (rev 1458) @@ -5,7 +5,7 @@ # Depends on: gtk, cups name=gtklp -version=1.2.1 +version=1.2.2 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.src.tar.…

1 0

r1457 - crux-2.2/ports/opt/imagemagick
by crux＠crux.nu 30 May '06

30 May '06

Author: sip Date: 2006-05-30 16:36:34 +0200 (Tue, 30 May 2006) New Revision: 1457 Modified: crux-2.2/ports/opt/imagemagick/.footprint crux-2.2/ports/opt/imagemagick/.md5sum crux-2.2/ports/opt/imagemagick/Pkgfile Log: imagemagick: updated to 6.2.7-8 Modified: crux-2.2/ports/opt/imagemagick/.footprint =================================================================== --- crux-2.2/ports/opt/imagemagick/.footprint 2006-05-28 20:08:33 UTC (rev 1456) +++ crux-2.2/ports/opt/imagemagick/.footprint 2006-05-30 14:36:34 UTC (rev 1457) @@ -137,7 +137,292 @@ -rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/config/type.xml drwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/ drwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/art.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/art.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/art.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/avi.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/avi.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/avi.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/avs.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/avs.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/avs.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/bmp.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/bmp.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/bmp.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/caption.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/caption.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/caption.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cin.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cin.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cin.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cip.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cip.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cip.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/clip.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/clip.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/clip.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cmyk.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cmyk.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cmyk.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cut.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cut.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/cut.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dcm.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dcm.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dcm.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dib.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dib.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dib.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dot.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dot.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dot.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dps.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dps.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dps.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dpx.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dpx.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/dpx.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ept.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ept.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ept.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/fax.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/fax.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/fax.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/fits.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/fits.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/fits.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gif.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gif.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gif.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gradient.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gradient.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gradient.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gray.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gray.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/gray.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/histogram.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/histogram.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/histogram.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/html.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/html.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/html.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/icon.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/icon.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/icon.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/info.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/info.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/info.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/jpeg.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/jpeg.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/jpeg.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/label.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/label.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/label.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/magick.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/magick.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/magick.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/map.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/map.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/map.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mat.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mat.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mat.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/matte.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/matte.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/matte.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/meta.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/meta.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/meta.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/miff.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/miff.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/miff.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mono.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mono.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mono.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpc.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpc.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpc.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpeg.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpeg.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpeg.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpr.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpr.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mpr.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/msl.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/msl.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/msl.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mtv.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mtv.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mtv.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mvg.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mvg.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/mvg.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/null.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/null.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/null.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/otb.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/otb.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/otb.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/palm.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/palm.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/palm.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pattern.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pattern.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pattern.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcd.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcd.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcd.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcl.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcl.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcl.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcx.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcx.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pcx.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pdb.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pdb.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pdb.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pdf.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pdf.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pdf.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pict.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pict.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pict.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pix.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pix.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pix.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/plasma.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/plasma.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/plasma.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/png.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/png.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/png.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pnm.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pnm.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pnm.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/preview.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/preview.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/preview.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps2.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps2.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps2.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps3.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps3.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ps3.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/psd.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/psd.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/psd.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pwp.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pwp.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/pwp.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/raw.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/raw.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/raw.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rgb.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rgb.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rgb.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rla.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rla.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rla.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rle.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rle.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/rle.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/scr.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/scr.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/scr.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sct.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sct.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sct.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sfw.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sfw.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sfw.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sgi.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sgi.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sgi.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/stegano.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/stegano.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/stegano.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sun.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sun.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/sun.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/svg.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/svg.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/svg.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tga.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tga.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tga.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tiff.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tiff.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tiff.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tile.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tile.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tile.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tim.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tim.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/tim.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ttf.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ttf.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ttf.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/txt.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/txt.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/txt.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/uil.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/uil.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/uil.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/url.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/url.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/url.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/uyvy.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/uyvy.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/uyvy.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/vicar.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/vicar.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/vicar.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/vid.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/vid.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/vid.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/viff.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/viff.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/viff.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wbmp.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wbmp.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wbmp.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wmf.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wmf.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wmf.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wpg.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wpg.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/wpg.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/x.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/x.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/x.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xbm.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xbm.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xbm.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xc.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xc.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xc.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xcf.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xcf.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xcf.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xpm.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xpm.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xpm.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xwd.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xwd.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/xwd.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ycbcr.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ycbcr.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/ycbcr.so +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/yuv.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/yuv.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/coders/yuv.so drwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/filters/ +-rw-r--r-- root/root usr/lib/ImageMagick-6.2.7/modules-Q16/filters/analyze.a +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/filters/analyze.la +-rwxr-xr-x root/root usr/lib/ImageMagick-6.2.7/modules-Q16/filters/analyze.so -rw-r--r-- root/root usr/lib/libMagick++.a -rwxr-xr-x root/root usr/lib/libMagick++.la lrwxrwxrwx root/root usr/lib/libMagick++.so -> libMagick++.so.10.0.2 Modified: crux-2.2/ports/opt/imagemagick/.md5sum =================================================================== --- crux-2.2/ports/opt/imagemagick/.md5sum 2006-05-28 20:08:33 UTC (rev 1456) +++ crux-2.2/ports/opt/imagemagick/.md5sum 2006-05-30 14:36:34 UTC (rev 1457) @@ -1 +1 @@ -64ff516d2415af6cb872a3f13a980faa ImageMagick-6.2.7-7.tar.bz2 +502d93894987c01c6c88795e264123b0 ImageMagick-6.2.7-8.tar.bz2 Modified: crux-2.2/ports/opt/imagemagick/Pkgfile =================================================================== --- crux-2.2/ports/opt/imagemagick/Pkgfile 2006-05-28 20:08:33 UTC (rev 1456) +++ crux-2.2/ports/opt/imagemagick/Pkgfile 2006-05-30 14:36:34 UTC (rev 1457) @@ -5,7 +5,7 @@ # Depends on: freetype ghostscript lcms libungif libxml2 name=imagemagick -version=6.2.7-7 +version=6.2.7-8 release=1 source=(ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ImageMagick-$version.tar.bz2)

1 0

r1456 - crux-2.2/ports/core/readline
by crux＠crux.nu 28 May '06

28 May '06

Author: jw Date: 2006-05-28 22:08:33 +0200 (Sun, 28 May 2006) New Revision: 1456 Modified: crux-2.2/ports/core/readline/.md5sum crux-2.2/ports/core/readline/Pkgfile crux-2.2/ports/core/readline/inputrc Log: readline: fix inputrc to work with bash 3.1.x Modified: crux-2.2/ports/core/readline/.md5sum =================================================================== --- crux-2.2/ports/core/readline/.md5sum 2006-05-27 20:14:05 UTC (rev 1455) +++ crux-2.2/ports/core/readline/.md5sum 2006-05-28 20:08:33 UTC (rev 1456) @@ -1,3 +1,3 @@ -75f2132b58ad2f0013671ee45c4b3bac inputrc +553cf04fdeec54dca12062864c3ffba3 inputrc 63faf622820ca0828131c8b5aeac1e6a readline-5.1-001.patch 7ee5a692db88b30ca48927a13fd60e46 readline-5.1.tar.gz Modified: crux-2.2/ports/core/readline/Pkgfile =================================================================== --- crux-2.2/ports/core/readline/Pkgfile 2006-05-27 20:14:05 UTC (rev 1455) +++ crux-2.2/ports/core/readline/Pkgfile 2006-05-28 20:08:33 UTC (rev 1456) @@ -4,7 +4,7 @@ name=readline version=5.1 -release=1 +release=2 source=(http://mirrors.sunsite.dk/gnu/$name/$name-$version.tar.gz \ $name-$version-001.patch inputrc) Modified: crux-2.2/ports/core/readline/inputrc =================================================================== --- crux-2.2/ports/core/readline/inputrc 2006-05-27 20:14:05 UTC (rev 1455) +++ crux-2.2/ports/core/readline/inputrc 2006-05-28 20:08:33 UTC (rev 1456) @@ -13,8 +13,8 @@ "\e[5~": beginning-of-history "\e[6~": end-of-history -"\M-p": history-search-backward -"\M-n": history-search-forward +"\ep": history-search-backward +"\en": history-search-forward $if term=xterm "\e[7~": beginning-of-line

1 0

r1455 - crux-2.2/ports/opt/libmusicbrainz
by crux＠crux.nu 27 May '06

27 May '06

Author: sten Date: 2006-05-27 22:14:05 +0200 (Sat, 27 May 2006) New Revision: 1455 Modified: crux-2.2/ports/opt/libmusicbrainz/.md5sum crux-2.2/ports/opt/libmusicbrainz/Pkgfile Log: libmusicbrainz: update to 2.1.2 Modified: crux-2.2/ports/opt/libmusicbrainz/.md5sum =================================================================== --- crux-2.2/ports/opt/libmusicbrainz/.md5sum 2006-05-26 20:44:28 UTC (rev 1454) +++ crux-2.2/ports/opt/libmusicbrainz/.md5sum 2006-05-27 20:14:05 UTC (rev 1455) @@ -1 +1 @@ -4f753d93a85cf413e00f1394b8cbd269 libmusicbrainz-2.1.1.tar.gz +88d35af903665fecbdee77eb6d5e6cdd libmusicbrainz-2.1.2.tar.gz Modified: crux-2.2/ports/opt/libmusicbrainz/Pkgfile =================================================================== --- crux-2.2/ports/opt/libmusicbrainz/Pkgfile 2006-05-26 20:44:28 UTC (rev 1454) +++ crux-2.2/ports/opt/libmusicbrainz/Pkgfile 2006-05-27 20:14:05 UTC (rev 1455) @@ -1,11 +1,11 @@ # Description: community music metadatabase # URL: http://www.musicbrainz.org/ # Maintainer: sten, nick dot steeves at shaw dot ca -# Packager: Robert McMeekin, rrm3 at rrm3 dot org +# Packager: # Depends on: expat name=libmusicbrainz -version=2.1.1 +version=2.1.2 release=1 source=(http://ftp.musicbrainz.org/pub/musicbrainz/$name-$version.tar.gz)

1 0

r1454 - crux-2.2/ports/core/bash
by crux＠crux.nu 26 May '06

26 May '06

Author: jw Date: 2006-05-26 22:44:28 +0200 (Fri, 26 May 2006) New Revision: 1454 Added: crux-2.2/ports/core/bash/bash-3.1-001-017.patch crux-2.2/ports/core/bash/bash-3.1-doc.patch Removed: crux-2.2/ports/core/bash/bash-3.0-001-016.patch crux-2.2/ports/core/bash/bash-3.0-doc.patch crux-2.2/ports/core/bash/bash-3.0-wcontinued.patch Modified: crux-2.2/ports/core/bash/.md5sum crux-2.2/ports/core/bash/Pkgfile Log: bash: update to 3.1.17 Modified: crux-2.2/ports/core/bash/.md5sum =================================================================== --- crux-2.2/ports/core/bash/.md5sum 2006-05-26 20:25:31 UTC (rev 1453) +++ crux-2.2/ports/core/bash/.md5sum 2006-05-26 20:44:28 UTC (rev 1454) @@ -1,5 +1,4 @@ -a55d4bc5f60e8a527fc7b76739ca2ec0 bash-3.0-001-016.patch -46d32222ea0ee4b92d9cad3130498e30 bash-3.0-doc.patch -93eb380f4dd903ee25e47c7950894578 bash-3.0-wcontinued.patch -26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz +bc337045fa4c5839babf0306cc9df6d0 bash-3.1-001-017.patch +46d32222ea0ee4b92d9cad3130498e30 bash-3.1-doc.patch +ef5304c4b22aaa5088972c792ed45d72 bash-3.1.tar.gz 7b57ddfc0866bfe6ee5eb714723d69b7 profile Modified: crux-2.2/ports/core/bash/Pkgfile =================================================================== --- crux-2.2/ports/core/bash/Pkgfile 2006-05-26 20:25:31 UTC (rev 1453) +++ crux-2.2/ports/core/bash/Pkgfile 2006-05-26 20:44:28 UTC (rev 1454) @@ -4,19 +4,17 @@ # Depends on: ncurses name=bash -version=3.0 -release=2 -source=(http://mirrors.sunsite.dk/gnu/$name/$name-$version.tar.gz \ - $name-$version-001-016.patch \ - $name-$version-doc.patch \ - $name-$version-wcontinued.patch \ +version=3.1.17 +release=1 +source=(http://mirrors.sunsite.dk/gnu/$name/$name-3.1.tar.gz \ + bash-3.1-001-017.patch \ + $name-3.1-doc.patch \ profile) build() { - cd $name-$version - patch -p1 < ../$name-$version-001-016.patch - patch -p1 < ../$name-$version-doc.patch - patch -p1 < ../$name-$version-wcontinued.patch + cd $name-3.1 + patch -p1 < ../$name-3.1-001-017.patch + patch -p1 < ../$name-3.1-doc.patch ./configure --prefix=/usr \ --exec-prefix= \ --disable-nls Deleted: crux-2.2/ports/core/bash/bash-3.0-001-016.patch =================================================================== --- crux-2.2/ports/core/bash/bash-3.0-001-016.patch 2006-05-26 20:25:31 UTC (rev 1453) +++ crux-2.2/ports/core/bash/bash-3.0-001-016.patch 2006-05-26 20:44:28 UTC (rev 1454) @@ -1,709 +0,0 @@ -Patches 001-016 from ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/ -Rediffed to apply cleanly on the vanilla 3.0 source. - -/Per Liden <per(a)fukt.bth.se> - - -diff -Nru bash-3.0/array.c bash-3.0-new/array.c ---- bash-3.0/array.c 2004-05-06 14:24:13.000000000 +0200 -+++ bash-3.0-new/array.c 2005-02-02 23:24:24.858374560 +0100 -@@ -451,7 +451,7 @@ - */ - array_dispose_element(new); - free(element_value(ae)); -- ae->value = savestring(v); -+ ae->value = v ? savestring(v) : (char *)NULL; - return(0); - } else if (element_index(ae) > i) { - ADD_BEFORE(ae, new); -diff -Nru bash-3.0/arrayfunc.c bash-3.0-new/arrayfunc.c ---- bash-3.0/arrayfunc.c 2003-12-19 06:03:09.000000000 +0100 -+++ bash-3.0-new/arrayfunc.c 2005-02-02 23:24:24.847376232 +0100 -@@ -611,7 +611,7 @@ - var = find_variable (t); - - free (t); -- return var; -+ return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var; - } - - /* Return a string containing the elements in the array and subscript -diff -Nru bash-3.0/bashline.c bash-3.0-new/bashline.c ---- bash-3.0/bashline.c 2004-07-06 05:22:12.000000000 +0200 -+++ bash-3.0-new/bashline.c 2005-02-02 23:24:38.680273312 +0100 -@@ -100,6 +100,7 @@ - #endif - - /* Helper functions for Readline. */ -+static int bash_directory_expansion __P((char **)); - static int bash_directory_completion_hook __P((char **)); - static int filename_completion_ignore __P((char **)); - static int bash_push_line __P((void)); -@@ -292,7 +293,7 @@ - /* See if we have anything to do. */ - at = strchr (rl_completer_word_break_characters, '@'); - if ((at == 0 && on_or_off == 0) || (at != 0 && on_or_off != 0)) -- return; -+ return old_value; - - /* We have something to do. Do it. */ - nval = (char *)xmalloc (strlen (rl_completer_word_break_characters) + 1 + on_or_off); -@@ -1406,10 +1407,19 @@ - filename. */ - if (*hint_text == '~') - { -- int l, tl, vl; -+ int l, tl, vl, dl; -+ char *rd; - vl = strlen (val); - tl = strlen (hint_text); -+#if 0 - l = vl - hint_len; /* # of chars added */ -+#else -+ rd = savestring (filename_hint); -+ bash_directory_expansion (&rd); -+ dl = strlen (rd); -+ l = vl - dl; /* # of chars added */ -+ free (rd); -+#endif - temp = (char *)xmalloc (l + 2 + tl); - strcpy (temp, hint_text); - strcpy (temp + tl, val + vl - l); -@@ -2187,6 +2197,27 @@ - return 0; - } - -+/* Simulate the expansions that will be performed by -+ rl_filename_completion_function. This must be called with the address of -+ a pointer to malloc'd memory. */ -+static int -+bash_directory_expansion (dirname) -+ char **dirname; -+{ -+ char *d; -+ -+ d = savestring (*dirname); -+ -+ if (rl_directory_rewrite_hook) -+ (*rl_directory_rewrite_hook) (&d); -+ -+ if (rl_directory_completion_hook && (*rl_directory_completion_hook) (&d)) -+ { -+ free (*dirname); -+ *dirname = d; -+ } -+} -+ - /* Handle symbolic link references and other directory name - expansions while hacking completion. */ - static int -@@ -2513,7 +2544,7 @@ - static char **matches = (char **)NULL; - static int ind; - int glen; -- char *ret; -+ char *ret, *ttext; - - if (state == 0) - { -@@ -2523,17 +2554,22 @@ - FREE (globorig); - FREE (globtext); - -+ ttext = bash_tilde_expand (text, 0); -+ - if (rl_explicit_arg) - { -- globorig = savestring (text); -- glen = strlen (text); -+ globorig = savestring (ttext); -+ glen = strlen (ttext); - globtext = (char *)xmalloc (glen + 2); -- strcpy (globtext, text); -+ strcpy (globtext, ttext); - globtext[glen] = '*'; - globtext[glen+1] = '\0'; - } - else -- globtext = globorig = savestring (text); -+ globtext = globorig = savestring (ttext); -+ -+ if (ttext != text) -+ free (ttext); - - matches = shell_glob_filename (globtext); - if (GLOB_FAILED (matches)) -diff -Nru bash-3.0/braces.c bash-3.0-new/braces.c ---- bash-3.0/braces.c 2003-12-04 17:09:52.000000000 +0100 -+++ bash-3.0-new/braces.c 2005-02-02 23:24:39.724114624 +0100 -@@ -340,8 +340,8 @@ - - if (lhs_t == ST_CHAR) - { -- lhs_v = lhs[0]; -- rhs_v = rhs[0]; -+ lhs_v = (unsigned char)lhs[0]; -+ rhs_v = (unsigned char)rhs[0]; - } - else - { -@@ -402,6 +402,8 @@ - { - pass_next = 1; - i++; -+ if (quoted == 0) -+ level++; - continue; - } - #endif -diff -Nru bash-3.0/builtins/trap.def bash-3.0-new/builtins/trap.def ---- bash-3.0/builtins/trap.def 2004-05-28 04:26:19.000000000 +0200 -+++ bash-3.0-new/builtins/trap.def 2005-02-02 23:24:28.541814592 +0100 -@@ -23,7 +23,7 @@ - - $BUILTIN trap - $FUNCTION trap_builtin --$SHORT_DOC trap [-lp] [[arg] signal_spec ...] -+$SHORT_DOC trap [-lp] [arg signal_spec ...] - The command ARG is to be read and executed when the shell receives - signal(s) SIGNAL_SPEC. If ARG is absent (and a single SIGNAL_SPEC - is supplied) or `-', each specified signal is reset to its original -@@ -87,7 +87,7 @@ - trap_builtin (list) - WORD_LIST *list; - { -- int list_signal_names, display, result, opt; -+ int list_signal_names, display, result, opt, first_signal; - - list_signal_names = display = 0; - result = EXECUTION_SUCCESS; -@@ -118,14 +118,19 @@ - else - { - char *first_arg; -- int operation, sig; -+ int operation, sig, first_signal; - - operation = SET; - first_arg = list->word->word; -+ first_signal = first_arg && *first_arg && all_digits (first_arg) && signal_object_p (first_arg, opt); -+ -+ /* Backwards compatibility */ -+ if (first_signal) -+ operation = REVERT; - /* When in posix mode, the historical behavior of looking for a - missing first argument is disabled. To revert to the original - signal handling disposition, use `-' as the first argument. */ -- if (posixly_correct == 0 && first_arg && *first_arg && -+ else if (posixly_correct == 0 && first_arg && *first_arg && - (*first_arg != '-' || first_arg[1]) && - signal_object_p (first_arg, opt) && list->next == 0) - operation = REVERT; -diff -Nru bash-3.0/doc/bashref.texi bash-3.0-new/doc/bashref.texi ---- bash-3.0/doc/bashref.texi 2004-06-26 20:26:07.000000000 +0200 -+++ bash-3.0-new/doc/bashref.texi 2005-02-02 23:24:28.546813832 +0100 -@@ -5953,7 +5953,8 @@ - @item - The @code{trap} builtin doesn't check the first argument for a possible - signal specification and revert the signal handling to the original --disposition if it is. If users want to reset the handler for a given -+disposition if it is, unless that argument consists solely of digits and -+is a valid signal number. If users want to reset the handler for a given - signal to the original disposition, they should use @samp{-} as the - first argument. - -diff -Nru bash-3.0/general.c bash-3.0-new/general.c ---- bash-3.0/general.c 2004-04-15 05:20:13.000000000 +0200 -+++ bash-3.0-new/general.c 2005-02-02 23:24:40.581984208 +0100 -@@ -267,7 +267,7 @@ - c = string[indx = 0]; - - #if defined (ARRAY_VARS) -- if ((legal_variable_starter (c) == 0) && (flags && c != '[')) /* ] */ -+ if ((legal_variable_starter (c) == 0) && (flags == 0 || c != '[')) /* ] */ - #else - if (legal_variable_starter (c) == 0) - #endif -diff -Nru bash-3.0/include/shmbutil.h bash-3.0-new/include/shmbutil.h ---- bash-3.0/include/shmbutil.h 2004-04-19 15:59:42.000000000 +0200 -+++ bash-3.0-new/include/shmbutil.h 2005-02-02 23:24:29.227710320 +0100 -@@ -31,6 +31,8 @@ - extern size_t xmbsrtowcs __P((wchar_t *, const char **, size_t, mbstate_t *)); - extern size_t xdupmbstowcs __P((wchar_t **, char ***, const char *)); - -+extern size_t mbstrlen __P((const char *)); -+ - extern char *xstrchr __P((const char *, int)); - - #ifndef MB_INVALIDCH -@@ -38,6 +40,9 @@ - #define MB_NULLWCH(x) ((x) == 0) - #endif - -+#define MBSLEN(s) (((s) && (s)[0]) ? ((s)[1] ? mbstrlen (s) : 1) : 0) -+#define MB_STRLEN(s) ((MB_CUR_MAX > 1) ? MBSLEN (s) : STRLEN (s)) -+ - #else /* !HANDLE_MULTIBYTE */ - - #undef MB_LEN_MAX -@@ -54,6 +59,8 @@ - #define MB_NULLWCH(x) (0) - #endif - -+#define MB_STRLEN(s) (STRLEN(s)) -+ - #endif /* !HANDLE_MULTIBYTE */ - - /* Declare and initialize a multibyte state. Call must be terminated -diff -Nru bash-3.0/jobs.c bash-3.0-new/jobs.c ---- bash-3.0/jobs.c 2004-04-23 22:28:25.000000000 +0200 -+++ bash-3.0-new/jobs.c 2005-02-02 23:24:36.979531864 +0100 -@@ -1778,8 +1778,13 @@ - if (pipefail_opt) - { - fail = 0; -- for (p = jobs[job]->pipe; p->next != jobs[job]->pipe; p = p->next) -- if (p->status != EXECUTION_SUCCESS) fail = p->status; -+ p = jobs[job]->pipe; -+ do -+ { -+ if (p->status != EXECUTION_SUCCESS) fail = p->status; -+ p = p->next; -+ } -+ while (p != jobs[job]->pipe); - return fail; - } - -diff -Nru bash-3.0/lib/readline/display.c bash-3.0-new/lib/readline/display.c ---- bash-3.0/lib/readline/display.c 2004-05-28 04:57:51.000000000 +0200 -+++ bash-3.0-new/lib/readline/display.c 2005-02-02 23:24:30.500516824 +0100 -@@ -201,7 +201,7 @@ - int *lp, *lip, *niflp, *vlp; - { - char *r, *ret, *p; -- int l, rl, last, ignoring, ninvis, invfl, ind, pind, physchars; -+ int l, rl, last, ignoring, ninvis, invfl, invflset, ind, pind, physchars; - - /* Short-circuit if we can. */ - if ((MB_CUR_MAX <= 1 || rl_byte_oriented) && strchr (pmt, RL_PROMPT_START_IGNORE) == 0) -@@ -222,6 +222,7 @@ - r = ret = (char *)xmalloc (l + 1); - - invfl = 0; /* invisible chars in first line of prompt */ -+ invflset = 0; /* we only want to set invfl once */ - - for (rl = ignoring = last = ninvis = physchars = 0, p = pmt; p && *p; p++) - { -@@ -249,7 +250,10 @@ - while (l--) - *r++ = *p++; - if (!ignoring) -- rl += ind - pind; -+ { -+ rl += ind - pind; -+ physchars += _rl_col_width (pmt, pind, ind); -+ } - else - ninvis += ind - pind; - p--; /* compensate for later increment */ -@@ -259,16 +263,19 @@ - { - *r++ = *p; - if (!ignoring) -- rl++; /* visible length byte counter */ -+ { -+ rl++; /* visible length byte counter */ -+ physchars++; -+ } - else - ninvis++; /* invisible chars byte counter */ - } - -- if (rl >= _rl_screenwidth) -- invfl = ninvis; -- -- if (ignoring == 0) -- physchars++; -+ if (invflset == 0 && rl >= _rl_screenwidth) -+ { -+ invfl = ninvis; -+ invflset = 1; -+ } - } - } - -@@ -351,14 +358,14 @@ - local_prompt = expand_prompt (p, &prompt_visible_length, - &prompt_last_invisible, - (int *)NULL, -- (int *)NULL); -+ &prompt_physical_chars); - c = *t; *t = '\0'; - /* The portion of the prompt string up to and including the - final newline is now null-terminated. */ - local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length, - (int *)NULL, - &prompt_invis_chars_first_line, -- &prompt_physical_chars); -+ (int *)NULL); - *t = c; - return (prompt_prefix_length); - } -@@ -417,7 +424,7 @@ - register int in, out, c, linenum, cursor_linenum; - register char *line; - int c_pos, inv_botlin, lb_botlin, lb_linenum; -- int newlines, lpos, temp, modmark; -+ int newlines, lpos, temp, modmark, n0, num; - char *prompt_this_line; - #if defined (HANDLE_MULTIBYTE) - wchar_t wc; -@@ -573,6 +580,7 @@ - - #if defined (HANDLE_MULTIBYTE) - memset (_rl_wrapped_line, 0, vis_lbsize); -+ num = 0; - #endif - - /* prompt_invis_chars_first_line is the number of invisible characters in -@@ -591,13 +599,32 @@ - probably too much work for the benefit gained. How many people have - prompts that exceed two physical lines? - Additional logic fix from Edward Catmur <ed(a)catmur.co.uk> */ -+#if defined (HANDLE_MULTIBYTE) -+ n0 = num; -+ temp = local_prompt ? strlen (local_prompt) : 0; -+ while (num < temp) -+ { -+ if (_rl_col_width (local_prompt, n0, num) > _rl_screenwidth) -+ { -+ num = _rl_find_prev_mbchar (local_prompt, num, MB_FIND_ANY); -+ break; -+ } -+ num++; -+ } -+ temp = num + -+#else - temp = ((newlines + 1) * _rl_screenwidth) + -+#endif /* !HANDLE_MULTIBYTE */ - ((local_prompt_prefix == 0) ? ((newlines == 0) ? prompt_invis_chars_first_line - : ((newlines == 1) ? wrap_offset : 0)) - : ((newlines == 0) ? wrap_offset :0)); - - inv_lbreaks[++newlines] = temp; -+#if defined (HANDLE_MULTIBYTE) -+ lpos -= _rl_col_width (local_prompt, n0, num); -+#else - lpos -= _rl_screenwidth; -+#endif - } - - prompt_last_screen_line = newlines; -diff -Nru bash-3.0/lib/readline/mbutil.c bash-3.0-new/lib/readline/mbutil.c ---- bash-3.0/lib/readline/mbutil.c 2004-01-14 15:44:52.000000000 +0100 -+++ bash-3.0-new/lib/readline/mbutil.c 2005-02-02 23:24:36.275638872 +0100 -@@ -126,11 +126,11 @@ - if (find_non_zero) - { - tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); -- while (wcwidth (wc) == 0) -+ while (tmp > 0 && wcwidth (wc) == 0) - { - point += tmp; - tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); -- if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2)) -+ if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp)) - break; - } - } -diff -Nru bash-3.0/lib/readline/misc.c bash-3.0-new/lib/readline/misc.c ---- bash-3.0/lib/readline/misc.c 2004-07-07 14:56:32.000000000 +0200 -+++ bash-3.0-new/lib/readline/misc.c 2005-02-02 23:24:29.860614104 +0100 -@@ -276,12 +276,6 @@ - _rl_saved_line_for_history->line = savestring (rl_line_buffer); - _rl_saved_line_for_history->data = (char *)rl_undo_list; - } -- else if (STREQ (rl_line_buffer, _rl_saved_line_for_history->line) == 0) -- { -- free (_rl_saved_line_for_history->line); -- _rl_saved_line_for_history->line = savestring (rl_line_buffer); -- _rl_saved_line_for_history->data = (char *)rl_undo_list; /* XXX possible memleak */ -- } - - return 0; - } -diff -Nru bash-3.0/lib/readline/vi_mode.c bash-3.0-new/lib/readline/vi_mode.c ---- bash-3.0/lib/readline/vi_mode.c 2004-07-13 20:08:27.000000000 +0200 -+++ bash-3.0-new/lib/readline/vi_mode.c 2005-02-02 23:24:32.590199144 +0100 -@@ -272,10 +272,12 @@ - switch (key) - { - case '?': -+ _rl_free_saved_history_line (); - rl_noninc_forward_search (count, key); - break; - - case '/': -+ _rl_free_saved_history_line (); - rl_noninc_reverse_search (count, key); - break; - -@@ -690,7 +692,7 @@ - { - wchar_t wc; - char mb[MB_LEN_MAX+1]; -- int mblen; -+ int mblen, p; - mbstate_t ps; - - memset (&ps, 0, sizeof (mbstate_t)); -@@ -713,11 +715,14 @@ - /* Vi is kind of strange here. */ - if (wc) - { -+ p = rl_point; - mblen = wcrtomb (mb, wc, &ps); - if (mblen >= 0) - mb[mblen] = '\0'; - rl_begin_undo_group (); -- rl_delete (1, 0); -+ rl_vi_delete (1, 0); -+ if (rl_point < p) /* Did we retreat at EOL? */ -+ rl_point++; /* XXX - should we advance more than 1 for mbchar? */ - rl_insert_text (mb); - rl_end_undo_group (); - rl_vi_check (); -@@ -1310,12 +1315,16 @@ - rl_vi_delete (1, c); - #if defined (HANDLE_MULTIBYTE) - if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -- while (_rl_insert_char (1, c)) -- { -- RL_SETSTATE (RL_STATE_MOREINPUT); -- c = rl_read_key (); -- RL_UNSETSTATE (RL_STATE_MOREINPUT); -- } -+ { -+ if (rl_point < p) /* Did we retreat at EOL? */ -+ rl_point++; -+ while (_rl_insert_char (1, c)) -+ { -+ RL_SETSTATE (RL_STATE_MOREINPUT); -+ c = rl_read_key (); -+ RL_UNSETSTATE (RL_STATE_MOREINPUT); -+ } -+ } - else - #endif - { -diff -Nru bash-3.0/patchlevel.h bash-3.0-new/patchlevel.h ---- bash-3.0/patchlevel.h 2001-08-22 14:05:39.000000000 +0200 -+++ bash-3.0-new/patchlevel.h 2005-02-02 23:24:41.498844824 +0100 -@@ -25,6 +25,6 @@ - regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh - looks for to find the patch level (for the sccs version string). */ - --#define PATCHLEVEL 0 -+#define PATCHLEVEL 16 - - #endif /* _PATCHLEVEL_H_ */ -diff -Nru bash-3.0/pcomplete.c bash-3.0-new/pcomplete.c ---- bash-3.0/pcomplete.c 2004-01-08 16:36:17.000000000 +0100 -+++ bash-3.0-new/pcomplete.c 2005-02-02 23:24:24.857374712 +0100 -@@ -863,6 +863,8 @@ - if (array_p (v) == 0) - v = convert_var_to_array (v); - v = assign_array_var_from_word_list (v, lwords); -+ -+ VUNSETATTR (v, att_invisible); - return v; - } - #endif /* ARRAY_VARS */ -@@ -1022,6 +1024,8 @@ - if (array_p (v) == 0) - v = convert_var_to_array (v); - -+ VUNSETATTR (v, att_invisible); -+ - a = array_cell (v); - if (a == 0 || array_empty (a)) - sl = (STRINGLIST *)NULL; -diff -Nru bash-3.0/subst.c bash-3.0-new/subst.c ---- bash-3.0/subst.c 2004-07-04 19:56:13.000000000 +0200 -+++ bash-3.0-new/subst.c 2005-02-02 23:24:41.495845280 +0100 -@@ -4691,6 +4691,26 @@ - legal_identifier (name + 1)); /* ${#PS1} */ - } - -+#if defined (HANDLE_MULTIBYTE) -+size_t -+mbstrlen (s) -+ const char *s; -+{ -+ size_t clen, nc; -+ mbstate_t mbs; -+ -+ nc = 0; -+ memset (&mbs, 0, sizeof (mbs)); -+ while ((clen = mbrlen(s, MB_CUR_MAX, &mbs)) != 0 && (MB_INVALIDCH(clen) == 0)) -+ { -+ s += clen; -+ nc++; -+ } -+ return nc; -+} -+#endif -+ -+ - /* Handle the parameter brace expansion that requires us to return the - length of a parameter. */ - static intmax_t -@@ -4746,14 +4766,14 @@ - if (legal_number (name + 1, &arg_index)) /* ${#1} */ - { - t = get_dollar_var_value (arg_index); -- number = STRLEN (t); -+ number = MB_STRLEN (t); - FREE (t); - } - #if defined (ARRAY_VARS) -- else if ((var = find_variable (name + 1)) && array_p (var)) -+ else if ((var = find_variable (name + 1)) && (invisible_p (var) == 0) && array_p (var)) - { - t = array_reference (array_cell (var), 0); -- number = STRLEN (t); -+ number = MB_STRLEN (t); - } - #endif - else /* ${#PS1} */ -@@ -4766,7 +4786,7 @@ - if (list) - dispose_words (list); - -- number = STRLEN (t); -+ number = MB_STRLEN (t); - FREE (t); - } - } -@@ -4871,7 +4891,7 @@ - { - case VT_VARIABLE: - case VT_ARRAYMEMBER: -- len = strlen (value); -+ len = MB_STRLEN (value); - break; - case VT_POSPARMS: - len = number_of_args () + 1; -@@ -4879,8 +4899,9 @@ - #if defined (ARRAY_VARS) - case VT_ARRAYVAR: - a = (ARRAY *)value; -- /* For arrays, the first value deals with array indices. */ -- len = array_max_index (a); /* arrays index from 0 to n - 1 */ -+ /* For arrays, the first value deals with array indices. Negative -+ offsets count from one past the array's maximum index. */ -+ len = array_max_index (a) + (*e1p < 0); /* arrays index from 0 to n - 1 */ - break; - #endif - } -@@ -4891,7 +4912,7 @@ - if (*e1p < 0) /* negative offsets count from end */ - *e1p += len; - -- if (*e1p >= len || *e1p < 0) -+ if (*e1p > len || *e1p < 0) - return (-1); - - #if defined (ARRAY_VARS) -@@ -4982,7 +5003,7 @@ - else - return -1; - } -- else if ((v = find_variable (varname)) && array_p (v)) -+ else if ((v = find_variable (varname)) && (invisible_p (v) == 0) && array_p (v)) - { - vtype = VT_ARRAYMEMBER; - *varp = v; -diff -Nru bash-3.0/tests/array.right bash-3.0-new/tests/array.right ---- bash-3.0/tests/array.right 2003-10-05 05:25:10.000000000 +0200 -+++ bash-3.0-new/tests/array.right 2005-02-02 23:24:41.497844976 +0100 -@@ -170,8 +170,8 @@ - three five seven - positive offset - expect five seven - five seven --negative offset - expect five seven --five seven -+negative offset to unset element - expect seven -+seven - positive offset 2 - expect seven - seven - negative offset 2 - expect seven -diff -Nru bash-3.0/tests/array.tests bash-3.0-new/tests/array.tests ---- bash-3.0/tests/array.tests 2003-10-05 05:25:00.000000000 +0200 -+++ bash-3.0-new/tests/array.tests 2005-02-02 23:24:41.496845128 +0100 -@@ -322,7 +322,7 @@ - - echo positive offset - expect five seven - echo ${av[@]:5:2} --echo negative offset - expect five seven -+echo negative offset to unset element - expect seven - echo ${av[@]: -2:2} - - echo positive offset 2 - expect seven -diff -Nru bash-3.0/tests/dbg-support.tests bash-3.0-new/tests/dbg-support.tests ---- bash-3.0/tests/dbg-support.tests 2003-03-25 21:33:03.000000000 +0100 -+++ bash-3.0-new/tests/dbg-support.tests 2005-02-02 23:24:24.859374408 +0100 -@@ -62,8 +62,8 @@ - trap 'print_debug_trap $LINENO' DEBUG - trap 'print_return_trap $LINENO' RETURN - --# Funcname is now an array. Vanilla Bash 2.05 doesn't have FUNCNAME array. --echo "FUNCNAME" ${FUNCNAME[0]} -+# Funcname is now an array, but you still can't see it outside a function -+echo "FUNCNAME" ${FUNCNAME[0]:-main} - - # We should trace into the below. - # Start easy with a simple function. -diff -Nru bash-3.0/tests/errors.right bash-3.0-new/tests/errors.right ---- bash-3.0/tests/errors.right 2004-05-28 04:26:03.000000000 +0200 -+++ bash-3.0-new/tests/errors.right 2005-02-02 23:24:28.548813528 +0100 -@@ -85,7 +85,7 @@ - ./errors.tests: line 213: /bin/sh + 0: syntax error: operand expected (error token is "/bin/sh + 0") - ./errors.tests: line 216: trap: NOSIG: invalid signal specification - ./errors.tests: line 219: trap: -s: invalid option --trap: usage: trap [-lp] [[arg] signal_spec ...] -+trap: usage: trap [-lp] [arg signal_spec ...] - ./errors.tests: line 225: return: can only `return' from a function or sourced script - ./errors.tests: line 229: break: 0: loop count out of range - ./errors.tests: line 233: continue: 0: loop count out of range -diff -Nru bash-3.0/variables.c bash-3.0-new/variables.c ---- bash-3.0/variables.c 2004-07-04 19:57:26.000000000 +0200 -+++ bash-3.0-new/variables.c 2005-02-02 23:24:24.855375016 +0100 -@@ -1419,11 +1419,11 @@ - v = init_dynamic_array_var ("GROUPS", get_groupset, null_array_assign, att_noassign); - - # if defined (DEBUGGER) -- v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, (att_invisible|att_noassign)); -- v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, (att_invisible|att_noassign)); -+ v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, att_noassign); -+ v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, att_noassign); - # endif /* DEBUGGER */ -- v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, (att_invisible|att_noassign)); -- v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, (att_invisible|att_noassign)); -+ v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, att_noassign); -+ v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, att_noassign); - #endif - - v = init_funcname_var (); -@@ -1599,7 +1599,10 @@ - /* local foo; local foo; is a no-op. */ - old_var = find_variable (name); - if (old_var && local_p (old_var) && old_var->context == variable_context) -- return (old_var); -+ { -+ VUNSETATTR (old_var, att_invisible); -+ return (old_var); -+ } - - was_tmpvar = old_var && tempvar_p (old_var); - if (was_tmpvar) Deleted: crux-2.2/ports/core/bash/bash-3.0-doc.patch =================================================================== --- crux-2.2/ports/core/bash/bash-3.0-doc.patch 2006-05-26 20:25:31 UTC (rev 1453) +++ crux-2.2/ports/core/bash/bash-3.0-doc.patch 2006-05-26 20:44:28 UTC (rev 1454) @@ -1,35 +0,0 @@ -diff -Nru bash-3.0/doc/Makefile.in bash-3.0-new/doc/Makefile.in ---- bash-3.0/doc/Makefile.in 2004-07-27 14:57:48.000000000 +0200 -+++ bash-3.0-new/doc/Makefile.in 2005-02-02 23:29:13.401509336 +0100 -@@ -141,7 +141,7 @@ - ${RM} $@ - -${DVIPS} $< - --all: ps info dvi text html -+all: - nodvi: ps info text html - - PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps -@@ -220,21 +220,9 @@ - $(SHELL) $(SUPPORT_SRCDIR)/mkinstalldirs $(DESTDIR)$(htmldir) ; \ - fi - --install: info installdirs bash.info -+install: installdirs - -$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext} - -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} --# uncomment the next line to install the builtins man page --# -$(INSTALL_DATA) $(srcdir)/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} -- -$(INSTALL_DATA) $(srcdir)/bash.info $(DESTDIR)$(infodir)/bash.info --# run install-info if it is present to update the info directory -- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -- install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/bash.info; \ -- else true; fi --# if htmldir is set, install the html files into that directory -- -if test -n "${htmldir}" ; then \ -- $(INSTALL_DATA) $(srcdir)/bash.html $(DESTDIR)$(htmldir) ; \ -- $(INSTALL_DATA) $(srcdir)/bashref.html $(DESTDIR)$(htmldir) ; \ -- fi - - uninstall: - -$(RM) $(DESTDIR)$(man1dir)/bash${man1ext} $(DESTDIR)$(man1dir)/bashbug${man1ext} Deleted: crux-2.2/ports/core/bash/bash-3.0-wcontinued.patch =================================================================== --- crux-2.2/ports/core/bash/bash-3.0-wcontinued.patch 2006-05-26 20:25:31 UTC (rev 1453) +++ crux-2.2/ports/core/bash/bash-3.0-wcontinued.patch 2006-05-26 20:44:28 UTC (rev 1454) @@ -1,38 +0,0 @@ -Submitted By: Jeremy Utley <jeremy(a)linuxfromscratch.org> -Date: 2004-10-13 -Initial Package Version: 3.0 -Upstream Status: Submitted Upstream -Origin: Originally created by Greg Schafer -Description: Bash-3.0 has a execution problem with newer Glibc's. This patch, -submitted to bash-bugs by Tim Waugh, fixes the problem. See: -http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00081.html -Patch also contains a slight code change taken from Fedora SRPM. - - -diff -Naur bash-3.0.orig/jobs.c bash-3.0/jobs.c ---- bash-3.0.orig/jobs.c 2004-10-12 08:50:11.643481280 +0000 -+++ bash-3.0/jobs.c 2004-10-12 08:51:35.110792320 +0000 -@@ -2476,6 +2476,7 @@ - PROCESS *child; - pid_t pid; - int call_set_current, last_stopped_job, job, children_exited, waitpid_flags; -+ static int wcontinued_not_supported = 0; - - call_set_current = children_exited = 0; - last_stopped_job = NO_JOB; -@@ -2489,7 +2490,15 @@ - : 0; - if (sigchld || block == 0) - waitpid_flags |= WNOHANG; -+ retry: -+ if (wcontinued_not_supported) -+ waitpid_flags &= ~WCONTINUED; - pid = WAITPID (-1, &status, waitpid_flags); -+ if (pid == -1 && errno == EINVAL) -+ { -+ wcontinued_not_supported = 1; -+ goto retry; -+ } - - /* The check for WNOHANG is to make sure we decrement sigchld only - if it was non-zero before we called waitpid. */ Added: crux-2.2/ports/core/bash/bash-3.1-001-017.patch =================================================================== --- crux-2.2/ports/core/bash/bash-3.1-001-017.patch (rev 0) +++ crux-2.2/ports/core/bash/bash-3.1-001-017.patch 2006-05-26 20:44:28 UTC (rev 1454) @@ -0,0 +1,723 @@ +Submitted By: Jeremy Huntwork (jhuntwork at linuxfromscratch dot org) +Date: 2006-04-11 +Initial Package Version: 3.1 +Origin: http://ftp.gnu.org/gnu/bash/bash-3.1-patches/ +Upstream Status: From Upstream +Description: Contains patches 001-017 from upstream + +diff -Naur bash-3.1.orig/arrayfunc.c bash-3.1/arrayfunc.c +--- bash-3.1.orig/arrayfunc.c 2005-07-04 17:25:58.000000000 -0700 ++++ bash-3.1/arrayfunc.c 2006-04-19 15:59:29.000000000 -0700 +@@ -592,11 +592,7 @@ + exp = (char *)xmalloc (len); + strncpy (exp, s, len - 1); + exp[len - 1] = '\0'; +-#if 0 +- t = expand_string_to_string (exp, 0); +-#else +- t = expand_string_to_string (exp, Q_DOUBLE_QUOTES); +-#endif ++ t = expand_arith_string (exp, 0); + this_command_name = (char *)NULL; + val = evalexp (t, &expok); + free (t); +diff -Naur bash-3.1.orig/doc/bash.1 bash-3.1/doc/bash.1 +--- bash-3.1.orig/doc/bash.1 2005-10-12 08:40:52.000000000 -0700 ++++ bash-3.1/doc/bash.1 2006-04-19 15:58:34.000000000 -0700 +@@ -6,12 +6,12 @@ + .\" Case Western Reserve University + .\" chet(a)po.cwru.edu + .\" +-.\" Last Change: Sat Aug 27 13:28:44 EDT 2005 ++.\" Last Change: Wed Dec 28 19:58:45 EST 2005 + .\" + .\" bash_builtins, strip all but Built-Ins section + .if \n(zZ=1 .ig zZ + .if \n(zY=1 .ig zY +-.TH BASH 1 "2005 Aug 27" "GNU Bash-3.1-beta1" ++.TH BASH 1 "2005 Dec 28" "GNU Bash-3.1" + .\" + .\" There's some problem with having a `@' + .\" in a tagged paragraph with the BSD man macros. +@@ -677,8 +677,8 @@ + .B nocasematch + is enabled, the match is performed without regard to the case + of alphabetic characters. +-The return value is 0 if the string matches or does not match +-the pattern, respectively, and 1 otherwise. ++The return value is 0 if the string matches (\fB==\fP) or does not match ++(\fB!=\fP) the pattern, and 1 otherwise. + Any part of the pattern may be quoted to force it to be matched as a + string. + .if t .sp 0.5 +@@ -807,6 +807,12 @@ + as for pathname expansion (see + .B Pathname Expansion + below). ++The \fIword\fP is expanded using tilde ++expansion, parameter and variable expansion, arithmetic substituion, ++command substitution, process substitution and quote removal. ++Each \fIpattern\fP examined is expanded using tilde ++expansion, parameter and variable expansion, arithmetic substituion, ++command substitution, and process substitution. + If the shell option + .B nocasematch + is enabled, the match is performed without regard to the case +@@ -8484,7 +8490,7 @@ + returns true if any of the arguments are found, false if + none are found. + .TP +-\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]] ++\fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]] + Provides control over the resources available to the shell and to + processes started by it, on systems that allow such control. + The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is +@@ -8523,6 +8529,9 @@ + .B \-f + The maximum size of files created by the shell + .TP ++.B \-i ++The maximum number of pending signals ++.TP + .B \-l + The maximum size that may be locked into memory + .TP +@@ -8536,6 +8545,9 @@ + .B \-p + The pipe size in 512-byte blocks (this may not be set) + .TP ++.B \-q ++The maximum number of bytes in POSIX message queues ++.TP + .B \-s + The maximum stack size + .TP +@@ -8547,6 +8559,9 @@ + .TP + .B \-v + The maximum amount of virtual memory available to the shell ++.TP ++.B \-x ++The maximum number of file locks + .PD + .PP + If +diff -Naur bash-3.1.orig/doc/bashref.texi bash-3.1/doc/bashref.texi +--- bash-3.1.orig/doc/bashref.texi 2005-10-03 12:07:21.000000000 -0700 ++++ bash-3.1/doc/bashref.texi 2006-04-19 15:58:34.000000000 -0700 +@@ -961,8 +961,8 @@ + (see the description of @code{shopt} in @ref{Bash Builtins}) + is enabled, the match is performed without regard to the case + of alphabetic characters. +-The return value is 0 if the string matches or does not match +-the pattern, respectively, and 1 otherwise. ++The return value is 0 if the string matches (@samp{==}) or does not ++match (@samp{!=})the pattern, and 1 otherwise. + Any part of the pattern may be quoted to force it to be matched as a + string. + +@@ -2598,7 +2598,7 @@ + Builtin commands are necessary to implement functionality impossible + or inconvenient to obtain with separate utilities. + +-This section briefly the builtins which Bash inherits from ++This section briefly describes the builtins which Bash inherits from + the Bourne Shell, as well as the builtin commands which are unique + to or have been extended in Bash. + +@@ -3833,7 +3833,7 @@ + @item ulimit + @btindex ulimit + @example +-ulimit [-acdflmnpstuvSH] [@var{limit}] ++ulimit [-acdfilmnpqstuvxSH] [@var{limit}] + @end example + @code{ulimit} provides control over the resources available to processes + started by the shell, on systems that allow such control. If an +@@ -3857,6 +3857,9 @@ + @item -f + The maximum size of files created by the shell. + ++@item -i ++The maximum number of pending signals. ++ + @item -l + The maximum size that may be locked into memory. + +@@ -3869,6 +3872,9 @@ + @item -p + The pipe buffer size. + ++@item -q ++The maximum number of bytes in POSIX message queues. ++ + @item -s + The maximum stack size. + +@@ -3881,6 +3887,9 @@ + @item -v + The maximum amount of virtual memory available to the process. + ++@item -x ++The maximum number of file locks. ++ + @end table + + If @var{limit} is given, it is the new value of the specified resource; +@@ -4089,8 +4098,8 @@ + Print shell input lines as they are read. + + @item -x +-Print a trace of simple commands, \fBfor\fP commands, \fBcase\fP +-commands, \fBselect\fP commands, and arithmetic \fBfor\fP commands ++Print a trace of simple commands, @code{for} commands, @code{case} ++commands, @code{select} commands, and arithmetic @code{for} commands + and their arguments or associated word lists after they are + expanded and before they are executed. The value of the @env{PS4} + variable is expanded and the resultant value is printed before +diff -Naur bash-3.1.orig/doc/version.texi bash-3.1/doc/version.texi +--- bash-3.1.orig/doc/version.texi 2005-09-20 11:52:56.000000000 -0700 ++++ bash-3.1/doc/version.texi 2006-04-19 15:58:34.000000000 -0700 +@@ -2,9 +2,9 @@ + Copyright (C) 1988-2005 Free Software Foundation, Inc. + @end ignore + +-@set LASTCHANGE Mon Sep 5 11:47:04 EDT 2005 ++@set LASTCHANGE Fri Dec 30 10:50:51 EST 2005 + +-@set EDITION 3.1-beta1 +-@set VERSION 3.1-beta1 +-@set UPDATED 5 September 2005 +-@set UPDATED-MONTH September 2005 ++@set EDITION 3.1 ++@set VERSION 3.1 ++@set UPDATED 30 December 2005 ++@set UPDATED-MONTH December 2005 +diff -Naur bash-3.1.orig/jobs.c bash-3.1/jobs.c +--- bash-3.1.orig/jobs.c 2005-11-11 20:13:27.000000000 -0800 ++++ bash-3.1/jobs.c 2006-04-19 15:58:34.000000000 -0700 +@@ -619,8 +619,11 @@ + * once in the parent and once in each child. This is where + * the parent gives it away. + * ++ * Don't give the terminal away if this shell is an asynchronous ++ * subshell. ++ * + */ +- if (job_control && newjob->pgrp) ++ if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0) + give_terminal_to (newjob->pgrp, 0); + } + } +@@ -844,9 +847,10 @@ + realloc_jobs_list () + { + sigset_t set, oset; +- int nsize, i, j; ++ int nsize, i, j, ncur, nprev; + JOB **nlist; + ++ ncur = nprev = NO_JOB; + nsize = ((js.j_njobs + JOB_SLOTS - 1) / JOB_SLOTS); + nsize *= JOB_SLOTS; + i = js.j_njobs % JOB_SLOTS; +@@ -854,17 +858,51 @@ + nsize += JOB_SLOTS; + + BLOCK_CHILD (set, oset); +- nlist = (JOB **) xmalloc (nsize * sizeof (JOB *)); ++ nlist = (js.j_jobslots == nsize) ? jobs : (JOB **) xmalloc (nsize * sizeof (JOB *)); ++ + for (i = j = 0; i < js.j_jobslots; i++) + if (jobs[i]) +- nlist[j++] = jobs[i]; ++ { ++ if (i == js.j_current) ++ ncur = j; ++ if (i == js.j_previous) ++ nprev = j; ++ nlist[j++] = jobs[i]; ++ } ++ ++#if defined (DEBUG) ++ itrace ("realloc_jobs_list: resize jobs list from %d to %d", js.j_jobslots, nsize); ++ itrace ("realloc_jobs_list: j_lastj changed from %d to %d", js.j_lastj, (j > 0) ? j - 1 : 0); ++ itrace ("realloc_jobs_list: j_njobs changed from %d to %d", js.j_njobs, (j > 0) ? j - 1 : 0); ++#endif + + js.j_firstj = 0; +- js.j_lastj = (j > 0) ? j - 1: 0; ++ js.j_lastj = (j > 0) ? j - 1 : 0; ++ js.j_njobs = j; + js.j_jobslots = nsize; + +- free (jobs); +- jobs = nlist; ++ /* Zero out remaining slots in new jobs list */ ++ for ( ; j < nsize; j++) ++ nlist[j] = (JOB *)NULL; ++ ++ if (jobs != nlist) ++ { ++ free (jobs); ++ jobs = nlist; ++ } ++ ++ if (ncur != NO_JOB) ++ js.j_current = ncur; ++ if (nprev != NO_JOB) ++ js.j_previous = nprev; ++ ++ /* Need to reset these */ ++ if (js.j_current == NO_JOB || js.j_previous == NO_JOB || js.j_current > js.j_lastj || js.j_previous > js.j_lastj) ++ reset_current (); ++ ++#ifdef DEBUG ++ itrace ("realloc_jobs_list: reset js.j_current (%d) and js.j_previous (%d)", js.j_current, js.j_previous); ++#endif + + UNBLOCK_CHILD (oset); + } +@@ -1655,7 +1693,7 @@ + In this case, we don't want to give the terminal to the + shell's process group (we could be in the middle of a + pipeline, for example). */ +- if (async_p == 0 && pipeline_pgrp != shell_pgrp) ++ if (async_p == 0 && pipeline_pgrp != shell_pgrp && ((subshell_environment&SUBSHELL_ASYNC) == 0)) + give_terminal_to (pipeline_pgrp, 0); + + #if defined (PGRP_PIPE) +@@ -2198,7 +2236,11 @@ + /* This is possibly a race condition -- should it go in stop_pipeline? */ + wait_sigint_received = 0; + if (job_control == 0) +- old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); ++ { ++ old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); ++ if (old_sigint_handler == SIG_IGN) ++ set_signal_handler (SIGINT, old_sigint_handler); ++ } + + termination_state = last_command_exit_value; + +diff -Naur bash-3.1.orig/lib/glob/glob.c bash-3.1/lib/glob/glob.c +--- bash-3.1.orig/lib/glob/glob.c 2005-03-24 09:42:27.000000000 -0800 ++++ bash-3.1/lib/glob/glob.c 2006-04-19 15:58:34.000000000 -0700 +@@ -360,6 +360,7 @@ + count = lose = skip = 0; + + firstmalloc = 0; ++ nalloca = 0; + + /* If PAT is empty, skip the loop, but return one (empty) filename. */ + if (pat == 0 || *pat == '\0') +@@ -546,6 +547,8 @@ + firstmalloc = 0; + tmplink = lastlink; + } ++ else ++ tmplink = 0; + free (lastlink->name); + lastlink = lastlink->next; + FREE (tmplink); +diff -Naur bash-3.1.orig/lib/glob/sm_loop.c bash-3.1/lib/glob/sm_loop.c +--- bash-3.1.orig/lib/glob/sm_loop.c 2005-10-16 18:21:04.000000000 -0700 ++++ bash-3.1/lib/glob/sm_loop.c 2006-04-19 15:58:34.000000000 -0700 +@@ -638,12 +638,13 @@ + CHAR *psub; /* pointer to sub-pattern */ + CHAR *pnext; /* pointer to next sub-pattern */ + CHAR *srest; /* pointer to rest of string */ +- int m1, m2; ++ int m1, m2, xflags; /* xflags = flags passed to recursive matches */ + + #if DEBUG_MATCHING + fprintf(stderr, "extmatch: xc = %c\n", xc); + fprintf(stderr, "extmatch: s = %s; se = %s\n", s, se); + fprintf(stderr, "extmatch: p = %s; pe = %s\n", p, pe); ++fprintf(stderr, "extmatch: flags = %d\n", flags); + #endif + + prest = PATSCAN (p + (*p == L('(')), pe, 0); /* ) */ +@@ -677,8 +678,12 @@ + string matches the rest of the pattern. Also handle + multiple matches of the pattern. */ + if (m1) +- m2 = (GMATCH (srest, se, prest, pe, flags) == 0) || +- (s != srest && GMATCH (srest, se, p - 1, pe, flags) == 0); ++ { ++ /* if srest > s, we are not at start of string */ ++ xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; ++ m2 = (GMATCH (srest, se, prest, pe, xflags) == 0) || ++ (s != srest && GMATCH (srest, se, p - 1, pe, xflags) == 0); ++ } + if (m1 && m2) + return (0); + } +@@ -704,8 +709,10 @@ + srest = (prest == pe) ? se : s; + for ( ; srest <= se; srest++) + { ++ /* if srest > s, we are not at start of string */ ++ xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; + if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 && +- GMATCH (srest, se, prest, pe, flags) == 0) ++ GMATCH (srest, se, prest, pe, xflags) == 0) + return (0); + } + if (pnext == prest) +@@ -726,7 +733,9 @@ + if (pnext == prest) + break; + } +- if (m1 == 0 && GMATCH (srest, se, prest, pe, flags) == 0) ++ /* if srest > s, we are not at start of string */ ++ xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; ++ if (m1 == 0 && GMATCH (srest, se, prest, pe, xflags) == 0) + return (0); + } + return (FNM_NOMATCH); +diff -Naur bash-3.1.orig/lib/readline/display.c bash-3.1/lib/readline/display.c +--- bash-3.1.orig/lib/readline/display.c 2005-11-30 11:05:02.000000000 -0800 ++++ bash-3.1/lib/readline/display.c 2006-04-19 15:58:34.000000000 -0700 +@@ -1983,11 +1983,15 @@ + int pchar; + { + int len; +- char *pmt; ++ char *pmt, *p; + + rl_save_prompt (); + +- if (saved_local_prompt == 0) ++ /* We've saved the prompt, and can do anything with the various prompt ++ strings we need before they're restored. We want the unexpanded ++ portion of the prompt string after any final newline. */ ++ p = rl_prompt ? strrchr (rl_prompt, '\n') : 0; ++ if (p == 0) + { + len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; + pmt = (char *)xmalloc (len + 2); +@@ -1998,19 +2002,17 @@ + } + else + { +- len = *saved_local_prompt ? strlen (saved_local_prompt) : 0; ++ p++; ++ len = strlen (p); + pmt = (char *)xmalloc (len + 2); + if (len) +- strcpy (pmt, saved_local_prompt); ++ strcpy (pmt, p); + pmt[len] = pchar; + pmt[len+1] = '\0'; +- local_prompt = savestring (pmt); +- prompt_last_invisible = saved_last_invisible; +- prompt_visible_length = saved_visible_length + 1; +- } ++ } + ++ /* will be overwritten by expand_prompt, called from rl_message */ + prompt_physical_chars = saved_physical_chars + 1; +- + return pmt; + } + +diff -Naur bash-3.1.orig/lib/readline/readline.c bash-3.1/lib/readline/readline.c +--- bash-3.1.orig/lib/readline/readline.c 2005-07-04 19:29:35.000000000 -0700 ++++ bash-3.1/lib/readline/readline.c 2006-04-19 15:58:34.000000000 -0700 +@@ -282,6 +282,7 @@ + { + FREE (rl_prompt); + rl_prompt = prompt ? savestring (prompt) : (char *)NULL; ++ rl_display_prompt = rl_prompt ? rl_prompt : ""; + + rl_visible_prompt_length = rl_expand_prompt (rl_prompt); + return 0; +diff -Naur bash-3.1.orig/lib/readline/terminal.c bash-3.1/lib/readline/terminal.c +--- bash-3.1.orig/lib/readline/terminal.c 2005-11-12 17:46:54.000000000 -0800 ++++ bash-3.1/lib/readline/terminal.c 2006-04-19 15:58:34.000000000 -0700 +@@ -122,7 +122,7 @@ + static char *_rl_visible_bell; + + /* Non-zero means the terminal can auto-wrap lines. */ +-int _rl_term_autowrap; ++int _rl_term_autowrap = -1; + + /* Non-zero means that this terminal has a meta key. */ + static int term_has_meta; +@@ -274,6 +274,9 @@ + _rl_set_screen_size (rows, cols) + int rows, cols; + { ++ if (_rl_term_autowrap == -1) ++ _rl_init_terminal_io (rl_terminal_name); ++ + if (rows > 0) + _rl_screenheight = rows; + if (cols > 0) +diff -Naur bash-3.1.orig/parse.y bash-3.1/parse.y +--- bash-3.1.orig/parse.y 2005-11-11 20:14:18.000000000 -0800 ++++ bash-3.1/parse.y 2006-04-19 15:58:34.000000000 -0700 +@@ -2716,6 +2716,7 @@ + #define P_ALLOWESC 0x02 + #define P_DQUOTE 0x04 + #define P_COMMAND 0x08 /* parsing a command, so look for comments */ ++#define P_BACKQUOTE 0x10 /* parsing a backquoted command substitution */ + + static char matched_pair_error; + static char * +@@ -2725,12 +2726,12 @@ + int *lenp, flags; + { + int count, ch, was_dollar, in_comment, check_comment; +- int pass_next_character, nestlen, ttranslen, start_lineno; ++ int pass_next_character, backq_backslash, nestlen, ttranslen, start_lineno; + char *ret, *nestret, *ttrans; + int retind, retsize, rflags; + + count = 1; +- pass_next_character = was_dollar = in_comment = 0; ++ pass_next_character = backq_backslash = was_dollar = in_comment = 0; + check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0; + + /* RFLAGS is the set of flags we want to pass to recursive calls. */ +@@ -2742,11 +2743,8 @@ + start_lineno = line_number; + while (count) + { +-#if 0 +- ch = shell_getc ((qc != '\'' || (flags & P_ALLOWESC)) && pass_next_character == 0); +-#else +- ch = shell_getc (qc != '\'' && pass_next_character == 0); +-#endif ++ ch = shell_getc (qc != '\'' && pass_next_character == 0 && backq_backslash == 0); ++ + if (ch == EOF) + { + free (ret); +@@ -2771,9 +2769,16 @@ + continue; + } + /* Not exactly right yet */ +- else if (check_comment && in_comment == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || whitespace (ret[retind -1]))) ++ else if MBTEST(check_comment && in_comment == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || whitespace (ret[retind - 1]))) + in_comment = 1; + ++ /* last char was backslash inside backquoted command substitution */ ++ if (backq_backslash) ++ { ++ backq_backslash = 0; ++ /* Placeholder for adding special characters */ ++ } ++ + if (pass_next_character) /* last char was backslash */ + { + pass_next_character = 0; +@@ -2814,6 +2819,8 @@ + { + if MBTEST((flags & P_ALLOWESC) && ch == '\\') + pass_next_character++; ++ else if MBTEST((flags & P_BACKQUOTE) && ch == '\\') ++ backq_backslash++; + continue; + } + +@@ -2898,7 +2905,11 @@ + } + else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0) + { +- nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags); ++ /* Add P_BACKQUOTE so backslash quotes the next character and ++ shell_getc does the right thing with \<newline>. We do this for ++ a measure of backwards compatibility -- it's not strictly the ++ right POSIX thing. */ ++ nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_BACKQUOTE); + goto add_nestret; + } + else if MBTEST(was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */ +@@ -2907,7 +2918,7 @@ + if (open == ch) /* undo previous increment */ + count--; + if (ch == '(') /* ) */ +- nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags); ++ nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags & ~P_DQUOTE); + else if (ch == '{') /* } */ + nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags); + else if (ch == '[') /* ] */ +@@ -3578,7 +3589,7 @@ + FREE (ttok); + all_digit_token = 0; + compound_assignment = 1; +-#if 0 ++#if 1 + goto next_character; + #else + goto got_token; /* ksh93 seems to do this */ +@@ -3695,7 +3706,9 @@ + struct builtin *b; + b = builtin_address_internal (token, 0); + if (b && (b->flags & ASSIGNMENT_BUILTIN)) +- parser_state |= PST_ASSIGNOK; ++ parser_state |= PST_ASSIGNOK; ++ else if (STREQ (token, "eval") || STREQ (token, "let")) ++ parser_state |= PST_ASSIGNOK; + } + + yylval.word = the_word; +@@ -4686,18 +4699,21 @@ + int *retlenp; + { + WORD_LIST *wl, *rl; +- int tok, orig_line_number, orig_token_size; ++ int tok, orig_line_number, orig_token_size, orig_last_token, assignok; + char *saved_token, *ret; + + saved_token = token; + orig_token_size = token_buffer_size; + orig_line_number = line_number; ++ orig_last_token = last_read_token; + + last_read_token = WORD; /* WORD to allow reserved words here */ + + token = (char *)NULL; + token_buffer_size = 0; + ++ assignok = parser_state&PST_ASSIGNOK; /* XXX */ ++ + wl = (WORD_LIST *)NULL; /* ( */ + parser_state |= PST_COMPASSIGN; + +@@ -4740,7 +4756,7 @@ + jump_to_top_level (DISCARD); + } + +- last_read_token = WORD; ++ last_read_token = orig_last_token; /* XXX - was WORD? */ + if (wl) + { + rl = REVERSE_LIST (wl, WORD_LIST *); +@@ -4752,6 +4768,10 @@ + + if (retlenp) + *retlenp = (ret && *ret) ? strlen (ret) : 0; ++ ++ if (assignok) ++ parser_state |= PST_ASSIGNOK; ++ + return ret; + } + +diff -Naur bash-3.1.orig/patchlevel.h bash-3.1/patchlevel.h +--- bash-3.1.orig/patchlevel.h 2005-07-20 10:58:20.000000000 -0700 ++++ bash-3.1/patchlevel.h 2006-04-19 15:59:29.000000000 -0700 +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 0 ++#define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ +diff -Naur bash-3.1.orig/subst.c bash-3.1/subst.c +--- bash-3.1.orig/subst.c 2005-10-24 06:51:13.000000000 -0700 ++++ bash-3.1/subst.c 2006-04-19 15:59:29.000000000 -0700 +@@ -2187,7 +2187,7 @@ + if (mklocal && variable_context) + { + v = find_variable (name); +- if (v == 0 || array_p (v) == 0) ++ if (v == 0 || array_p (v) == 0 || v->context != variable_context) + v = make_local_array_variable (name); + v = assign_array_var_from_string (v, value, flags); + } +@@ -2575,6 +2575,13 @@ + return (expand_string_to_string_internal (string, quoted, expand_string_assignment)); + } + ++char * ++expand_arith_string (string, quoted) ++ char *string; ++{ ++ return (expand_string_if_necessary (string, quoted, expand_string)); ++} ++ + #if defined (COND_COMMAND) + /* Just remove backslashes in STRING. Returns a new string. */ + char * +@@ -5248,7 +5255,7 @@ + else + t = (char *)0; + +- temp1 = expand_string_if_necessary (substr, Q_DOUBLE_QUOTES, expand_string); ++ temp1 = expand_arith_string (substr, Q_DOUBLE_QUOTES); + *e1p = evalexp (temp1, &expok); + free (temp1); + if (expok == 0) +@@ -5293,7 +5300,7 @@ + { + t++; + temp2 = savestring (t); +- temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string); ++ temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES); + free (temp2); + t[-1] = ':'; + *e2p = evalexp (temp1, &expok); +@@ -6435,7 +6442,7 @@ + temp2[t_index] = '\0'; + + /* Expand variables found inside the expression. */ +- temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string); ++ temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES); + free (temp2); + + arithsub: +@@ -6477,7 +6484,7 @@ + zindex = t_index; + + /* Do initial variable expansion. */ +- temp1 = expand_string_if_necessary (temp, Q_DOUBLE_QUOTES, expand_string); ++ temp1 = expand_arith_string (temp, Q_DOUBLE_QUOTES); + + goto arithsub; + +@@ -6795,6 +6802,12 @@ + if (temp && *temp && t_index > 0) + { + temp1 = bash_tilde_expand (temp, tflag); ++ if (temp1 && *temp1 == '~' && STREQ (temp, temp1)) ++ { ++ FREE (temp); ++ FREE (temp1); ++ goto add_character; /* tilde expansion failed */ ++ } + free (temp); + temp = temp1; + sindex += t_index; +diff -Naur bash-3.1.orig/subst.h bash-3.1/subst.h +--- bash-3.1.orig/subst.h 2004-11-07 12:12:28.000000000 -0800 ++++ bash-3.1/subst.h 2006-04-19 15:59:29.000000000 -0700 +@@ -151,6 +151,9 @@ + extern char *expand_string_unsplit_to_string __P((char *, int)); + extern char *expand_assignment_string_to_string __P((char *, int)); + ++/* Expand an arithmetic expression string */ ++extern char *expand_arith_string __P((char *, int)); ++ + /* De-quoted quoted characters in STRING. */ + extern char *dequote_string __P((char *)); + +diff -Naur bash-3.1.orig/variables.c bash-3.1/variables.c +--- bash-3.1.orig/variables.c 2005-11-12 18:22:37.000000000 -0800 ++++ bash-3.1/variables.c 2006-04-19 15:58:34.000000000 -0700 +@@ -860,9 +860,11 @@ + { + char val[INT_STRLEN_BOUND(int) + 1], *v; + ++#if defined (READLINE) + /* If we are currently assigning to LINES or COLUMNS, don't do anything. */ + if (winsize_assignment) + return; ++#endif + + v = inttostr (lines, val, sizeof (val)); + bind_variable ("LINES", v, 0); Added: crux-2.2/ports/core/bash/bash-3.1-doc.patch =================================================================== --- crux-2.2/ports/core/bash/bash-3.1-doc.patch (rev 0) +++ crux-2.2/ports/core/bash/bash-3.1-doc.patch 2006-05-26 20:44:28 UTC (rev 1454) @@ -0,0 +1,35 @@ +diff -Nru bash-3.0/doc/Makefile.in bash-3.0-new/doc/Makefile.in +--- bash-3.0/doc/Makefile.in 2004-07-27 14:57:48.000000000 +0200 ++++ bash-3.0-new/doc/Makefile.in 2005-02-02 23:29:13.401509336 +0100 +@@ -141,7 +141,7 @@ + ${RM} $@ + -${DVIPS} $< + +-all: ps info dvi text html ++all: + nodvi: ps info text html + + PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps +@@ -220,21 +220,9 @@ + $(SHELL) $(SUPPORT_SRCDIR)/mkinstalldirs $(DESTDIR)$(htmldir) ; \ + fi + +-install: info installdirs bash.info ++install: installdirs + -$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash${man1ext} + -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} +-# uncomment the next line to install the builtins man page +-# -$(INSTALL_DATA) $(srcdir)/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} +- -$(INSTALL_DATA) $(srcdir)/bash.info $(DESTDIR)$(infodir)/bash.info +-# run install-info if it is present to update the info directory +- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ +- install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/bash.info; \ +- else true; fi +-# if htmldir is set, install the html files into that directory +- -if test -n "${htmldir}" ; then \ +- $(INSTALL_DATA) $(srcdir)/bash.html $(DESTDIR)$(htmldir) ; \ +- $(INSTALL_DATA) $(srcdir)/bashref.html $(DESTDIR)$(htmldir) ; \ +- fi + + uninstall: + -$(RM) $(DESTDIR)$(man1dir)/bash${man1ext} $(DESTDIR)$(man1dir)/bashbug${man1ext}

1 0

r1453 - crux-2.2/ports/core/make
by crux＠crux.nu 26 May '06

26 May '06

Author: jw Date: 2006-05-26 22:25:31 +0200 (Fri, 26 May 2006) New Revision: 1453 Modified: crux-2.2/ports/core/make/.md5sum crux-2.2/ports/core/make/Pkgfile Log: make: update to 3.81 Modified: crux-2.2/ports/core/make/.md5sum =================================================================== --- crux-2.2/ports/core/make/.md5sum 2006-05-26 00:21:07 UTC (rev 1452) +++ crux-2.2/ports/core/make/.md5sum 2006-05-26 20:25:31 UTC (rev 1453) @@ -1 +1 @@ -c68540da9302a48068d5cce1f0099477 make-3.80.tar.gz +354853e0b2da90c527e35aabb8d6f1e6 make-3.81.tar.bz2 Modified: crux-2.2/ports/core/make/Pkgfile =================================================================== --- crux-2.2/ports/core/make/Pkgfile 2006-05-26 00:21:07 UTC (rev 1452) +++ crux-2.2/ports/core/make/Pkgfile 2006-05-26 20:25:31 UTC (rev 1453) @@ -3,9 +3,9 @@ # Maintainer: Per Lid�n, core-ports at crux dot nu name=make -version=3.80 +version=3.81 release=1 -source=(http://mirrors.sunsite.dk/gnu/$name/$name-$version.tar.gz) +source=(ftp://ftp.uninett.no/pub/gnu/$name/$name-$version.tar.bz2) build() { cd $name-$version

1 0

r1452 - crux-2.2/ports/opt/bzflag
by crux＠crux.nu 26 May '06

26 May '06

Author: danielw Date: 2006-05-26 02:21:07 +0200 (Fri, 26 May 2006) New Revision: 1452 Modified: crux-2.2/ports/opt/bzflag/.md5sum crux-2.2/ports/opt/bzflag/Pkgfile Log: bzflag: 2.0.6 -> 2.0.8 Modified: crux-2.2/ports/opt/bzflag/.md5sum =================================================================== --- crux-2.2/ports/opt/bzflag/.md5sum 2006-05-26 00:17:09 UTC (rev 1451) +++ crux-2.2/ports/opt/bzflag/.md5sum 2006-05-26 00:21:07 UTC (rev 1452) @@ -1 +1 @@ -5754f4d0f36935ae8b3bb8a2019c39c9 bzflag-2.0.6.tar.bz2 +7963cc1de7144e76a9426b6f23d7c2c8 bzflag-2.0.8.tar.bz2 Modified: crux-2.2/ports/opt/bzflag/Pkgfile =================================================================== --- crux-2.2/ports/opt/bzflag/Pkgfile 2006-05-26 00:17:09 UTC (rev 1451) +++ crux-2.2/ports/opt/bzflag/Pkgfile 2006-05-26 00:21:07 UTC (rev 1452) @@ -3,7 +3,7 @@ # Maintainer: Daniel Walpole, daniel at walpole dot id dot au name=bzflag -version=2.0.6 +version=2.0.8 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)

1 0

r1451 - crux-2.2/ports/opt/sdl_ttf
by crux＠crux.nu 26 May '06

26 May '06

Author: danielw Date: 2006-05-26 02:17:09 +0200 (Fri, 26 May 2006) New Revision: 1451 Modified: crux-2.2/ports/opt/sdl_ttf/.footprint crux-2.2/ports/opt/sdl_ttf/.md5sum crux-2.2/ports/opt/sdl_ttf/Pkgfile Log: sdl_ttf: 2.0.7 -> 2.0.8 Modified: crux-2.2/ports/opt/sdl_ttf/.footprint =================================================================== --- crux-2.2/ports/opt/sdl_ttf/.footprint 2006-05-26 00:13:02 UTC (rev 1450) +++ crux-2.2/ports/opt/sdl_ttf/.footprint 2006-05-26 00:17:09 UTC (rev 1451) @@ -3,8 +3,8 @@ drwxr-xr-x root/root usr/include/SDL/ -rw-r--r-- root/root usr/include/SDL/SDL_ttf.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libSDL_ttf-2.0.so.0 -> libSDL_ttf-2.0.so.0.6.1 --rwxr-xr-x root/root usr/lib/libSDL_ttf-2.0.so.0.6.1 +lrwxrwxrwx root/root usr/lib/libSDL_ttf-2.0.so.0 -> libSDL_ttf-2.0.so.0.6.2 +-rwxr-xr-x root/root usr/lib/libSDL_ttf-2.0.so.0.6.2 -rw-r--r-- root/root usr/lib/libSDL_ttf.a -rwxr-xr-x root/root usr/lib/libSDL_ttf.la -lrwxrwxrwx root/root usr/lib/libSDL_ttf.so -> libSDL_ttf-2.0.so.0.6.1 +lrwxrwxrwx root/root usr/lib/libSDL_ttf.so -> libSDL_ttf-2.0.so.0.6.2 Modified: crux-2.2/ports/opt/sdl_ttf/.md5sum =================================================================== --- crux-2.2/ports/opt/sdl_ttf/.md5sum 2006-05-26 00:13:02 UTC (rev 1450) +++ crux-2.2/ports/opt/sdl_ttf/.md5sum 2006-05-26 00:17:09 UTC (rev 1451) @@ -1 +1 @@ -0f6ee1a502e6913a412aac353dc75bbc SDL_ttf-2.0.7.tar.gz +094b6c08769e9842dbe1dfb5efa22df7 SDL_ttf-2.0.8.tar.gz Modified: crux-2.2/ports/opt/sdl_ttf/Pkgfile =================================================================== --- crux-2.2/ports/opt/sdl_ttf/Pkgfile 2006-05-26 00:13:02 UTC (rev 1450) +++ crux-2.2/ports/opt/sdl_ttf/Pkgfile 2006-05-26 00:17:09 UTC (rev 1451) @@ -4,7 +4,7 @@ # Depends on: freetype, libsdl name=sdl_ttf -version=2.0.7 +version=2.0.8 release=1 source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$version.tar…

1 0

r1450 - crux-2.2/ports/opt/lbreakout2
by crux＠crux.nu 26 May '06

26 May '06

Author: danielw Date: 2006-05-26 02:13:02 +0200 (Fri, 26 May 2006) New Revision: 1450 Modified: crux-2.2/ports/opt/lbreakout2/.md5sum crux-2.2/ports/opt/lbreakout2/Pkgfile Log: lbreakout2: 2.6beta-4 -> 2.6beta-5 Modified: crux-2.2/ports/opt/lbreakout2/.md5sum =================================================================== --- crux-2.2/ports/opt/lbreakout2/.md5sum 2006-05-26 00:11:42 UTC (rev 1449) +++ crux-2.2/ports/opt/lbreakout2/.md5sum 2006-05-26 00:13:02 UTC (rev 1450) @@ -1 +1 @@ -914a29f1bf254c6fe157992286a0d6bb lbreakout2-2.6beta-4.tar.gz +230cb94fc3f532d9997d3945a7659011 lbreakout2-2.6beta-5.tar.gz Modified: crux-2.2/ports/opt/lbreakout2/Pkgfile =================================================================== --- crux-2.2/ports/opt/lbreakout2/Pkgfile 2006-05-26 00:11:42 UTC (rev 1449) +++ crux-2.2/ports/opt/lbreakout2/Pkgfile 2006-05-26 00:13:02 UTC (rev 1450) @@ -4,7 +4,7 @@ # Depends on: libpng, sdl_mixer, sdl_net name=lbreakout2 -version=2.6beta-4 +version=2.6beta-5 release=1 source=(http://dl.sourceforge.net/sourceforge/lgames/$name-$version.tar.gz)

1 0

r1449 - crux-2.2/ports/opt/mednafen
by crux＠crux.nu 26 May '06

26 May '06

Author: danielw Date: 2006-05-26 02:11:42 +0200 (Fri, 26 May 2006) New Revision: 1449 Modified: crux-2.2/ports/opt/mednafen/.md5sum crux-2.2/ports/opt/mednafen/Pkgfile Log: mednafen: 0.5.2 -> 0.6.1 Modified: crux-2.2/ports/opt/mednafen/.md5sum =================================================================== --- crux-2.2/ports/opt/mednafen/.md5sum 2006-05-25 23:40:22 UTC (rev 1448) +++ crux-2.2/ports/opt/mednafen/.md5sum 2006-05-26 00:11:42 UTC (rev 1449) @@ -1 +1 @@ -6a49b7278551a37dec995b3616f81d85 mednafen-0.5.2.tar.bz2 +4918b570f48f049021ead85b3b40edcb mednafen-0.6.1.tar.bz2 Modified: crux-2.2/ports/opt/mednafen/Pkgfile =================================================================== --- crux-2.2/ports/opt/mednafen/Pkgfile 2006-05-25 23:40:22 UTC (rev 1448) +++ crux-2.2/ports/opt/mednafen/Pkgfile 2006-05-26 00:11:42 UTC (rev 1449) @@ -4,7 +4,7 @@ # Depends on: libsdl, libsamplerate, libcdio name=mednafen -version=0.5.2 +version=0.6.1 release=1 source=(http://mednafen.fobby.net/releases/$name-$version.tar.bz2)

1 0