November 2006 - crux-commits

ports/opt (2.3): sane: fixed README
by crux＠crux.nu 30 Nov '06

30 Nov '06

commit 926c3b8ea7681d515e05db687fbcb602e18da5b3 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 28 21:54:31 2006 +0100 sane: fixed README diff --git a/sane/README b/sane/README index fb9af43..56c2217 100644 --- a/sane/README +++ b/sane/README @@ -3,8 +3,9 @@ README for sane 1.0.x REQUIREMENTS PRE-INSTALL - 1. If you're using an USB scanner, create the group 'scanner' and - add all users which need access to your device. + 1. Create the group 'scanner' and add all users which need access to your device. + + # groupadd scanner POST-INSTALL 1. To find the vendor/product id of your scanner, run the command:

1 0

ports/opt (2.3): ngrep: update to 1.45
by crux＠crux.nu 30 Nov '06

30 Nov '06

commit e2b63d2475af05f5a699e2ba7a69f113ebf075a4 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 28 20:18:14 2006 +0100 ngrep: update to 1.45 diff --git a/ngrep/.md5sum b/ngrep/.md5sum index bd99c0c..cd5b5eb 100644 --- a/ngrep/.md5sum +++ b/ngrep/.md5sum @@ -1 +1 @@ -8a142d74043609b09ed57d3baadb2fd6 ngrep-1.44.tar.bz2 +bc8150331601f3b869549c94866b4f1c ngrep-1.45.tar.bz2 diff --git a/ngrep/Pkgfile b/ngrep/Pkgfile index 28f7a0d..1029d8f 100644 --- a/ngrep/Pkgfile +++ b/ngrep/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcap name=ngrep -version=1.44 +version=1.45 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)

1 0

ports/core (2.2): grub: removed old menu.lst.sample
by crux＠crux.nu 30 Nov '06

30 Nov '06

commit 6eac39d07e3c4b4be49c5465707d6dc7201f8e53 Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Nov 30 09:34:25 2006 -0600 grub: removed old menu.lst.sample diff --git a/grub/menu.lst.sample b/grub/menu.lst.sample deleted file mode 100644 index 5a066ab..0000000 --- a/grub/menu.lst.sample +++ /dev/null @@ -1,64 +0,0 @@ -### Global settings - -## CRUX splash image -splashimage (hd0,0)/boot/grub/crux03.xpm.gz -## define special fore-/background colors for splash screen image -foreground = FFFFFF -background = AAAAAA - -## shaded text -#shade 1 - -## time to wait for user interaction -timeout 5 - -## default boot kernel -default 0 - -### GRUB Devices: -## -## Linux Grub -## ====================== -## /dev/hda (hd0) -## /dev/hda1 (hd0,0) -## /dev/hdb (hd1) -## /dev/hdb1 (hd1,0) -## /dev/fd0 (fd0) - -### Remember: -## The Linux kernel 2.4.19 has a bug which prevents using of devfs -## device names (/dev/disc/disc0/part1,..). CRUX 0.9.4 comes with -## 2.4.19 ! - -## Default menu entries - -title CRUX -kernel (hd0,0)/boot/vmlinuz root=/dev/hda1 - -title CRUX -kernel (hd0,0)/boot/vmlinuz.old root=/dev/hda1 - -### Special cases - -## Boot special bootimage -#title Memtest -#kernel (hd0,0)/boot/memtest.bin - -## Boot Microsoft Windows(TM) -#title Windows -#root (hd0,5) -#makeactive -#chainloader +1 - -## Boot from Floppy -#title floppy -#root (fd0) -#chainloader +1 - -## Boot with different /boot partition -## / = /dev/hdb2 = (hd1,1) -## /boot = /dev/hdb1 = (hd1,0) -## -#title CRUX GNU/Linux drive 2 -#kernel (hd1,0)/vmlinuz root=/dev/hdb2 -

1 0

ports/core (2.2): grub: menu.lst renamed to grub.conf, updated README and aesthetic fixups
by crux＠crux.nu 30 Nov '06

30 Nov '06

commit a4e462fda8b1f117405bfb49165466529dd0256c Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Nov 30 09:27:16 2006 -0600 grub: menu.lst renamed to grub.conf, updated README and aesthetic fixups diff --git a/grub/.footprint b/grub/.footprint index 1a40213..b6da109 100644 --- a/grub/.footprint +++ b/grub/.footprint @@ -2,7 +2,7 @@ drwxr-xr-x root/root boot/ drwxr-xr-x root/root boot/grub/ -rw-r--r-- root/root boot/grub/crux02.xpm.gz -rw-r--r-- root/root boot/grub/crux03.xpm.gz --rw-r--r-- root/root boot/grub/menu.lst.sample +-rw-r--r-- root/root boot/grub/grub.conf.sample drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/grub -rwxr-xr-x root/root sbin/grub-install diff --git a/grub/.md5sum b/grub/.md5sum index eb52e38..2d994f6 100644 --- a/grub/.md5sum +++ b/grub/.md5sum @@ -2,4 +2,4 @@ 55e343038043e16df5293d63782373d0 crux03.xpm.gz e0fce491c713805650df3d8962ead526 grub-0.97-patches.tar.gz cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz -1f2733522ab27183e3830d93733141ac menu.lst.sample +1f2733522ab27183e3830d93733141ac grub.conf.sample diff --git a/grub/Pkgfile b/grub/Pkgfile index 07f9a4c..297c3bb 100644 --- a/grub/Pkgfile +++ b/grub/Pkgfile @@ -6,12 +6,12 @@ name=grub version=0.97 -release=1 +release=2 source=(ftp://alpha.gnu.org/gnu/grub/$name-$version.tar.gz \ http://crux.nu/files/grub/$version/$name-$version-patches.tar.gz \ http://crux.nu/files/grub/common/crux02.xpm.gz \ http://crux.nu/files/grub/common/crux03.xpm.gz \ - menu.lst.sample) + grub.conf.sample) build () { cd $name-$version @@ -82,5 +82,5 @@ build () { rm -rf $PKG/usr/share/info mkdir -p $PKG/boot/grub - install -m 644 $SRC/{crux*,menu.lst.sample} $PKG/boot/grub/ + install -m 644 $SRC/{crux*,grub.conf.sample} $PKG/boot/grub/ } diff --git a/grub/README b/grub/README index 2027d2f..411bd61 100644 --- a/grub/README +++ b/grub/README @@ -19,9 +19,9 @@ POST-INSTALL Now it's time to create your own "boot menu": # # Copy sample file - # cp /boot/grub/menu.lst.sample /boot/grub/menu.lst + # cp /boot/grub/grub.conf.sample /boot/grub/grub.conf # # Modify it for your system - # vi /boot/grub/menu.lst + # vi /boot/grub/grub.conf For more information about setting up your own grub boot menu file: http://www.gnu.org/manual/grub-0.92/html_mono/grub.html#Configuration @@ -43,9 +43,8 @@ POST-INSTALL PRECAUTION Installing a new boot manager is like modifiying the partition table - using fdisk - or installing a new system kernel. Please create a rescue - boot disk first :) - This is a heavy patched version of grub - Use it on your own risk ! + or installing a new system kernel. Please create a rescue disk first :) + This is a heavily patched version of grub - Use it at your own risk ! Matt Housh <jaeger(a)crux.nu> diff --git a/grub/grub.conf.sample b/grub/grub.conf.sample new file mode 100644 index 0000000..5a066ab --- /dev/null +++ b/grub/grub.conf.sample @@ -0,0 +1,64 @@ +### Global settings + +## CRUX splash image +splashimage (hd0,0)/boot/grub/crux03.xpm.gz +## define special fore-/background colors for splash screen image +foreground = FFFFFF +background = AAAAAA + +## shaded text +#shade 1 + +## time to wait for user interaction +timeout 5 + +## default boot kernel +default 0 + +### GRUB Devices: +## +## Linux Grub +## ====================== +## /dev/hda (hd0) +## /dev/hda1 (hd0,0) +## /dev/hdb (hd1) +## /dev/hdb1 (hd1,0) +## /dev/fd0 (fd0) + +### Remember: +## The Linux kernel 2.4.19 has a bug which prevents using of devfs +## device names (/dev/disc/disc0/part1,..). CRUX 0.9.4 comes with +## 2.4.19 ! + +## Default menu entries + +title CRUX +kernel (hd0,0)/boot/vmlinuz root=/dev/hda1 + +title CRUX +kernel (hd0,0)/boot/vmlinuz.old root=/dev/hda1 + +### Special cases + +## Boot special bootimage +#title Memtest +#kernel (hd0,0)/boot/memtest.bin + +## Boot Microsoft Windows(TM) +#title Windows +#root (hd0,5) +#makeactive +#chainloader +1 + +## Boot from Floppy +#title floppy +#root (fd0) +#chainloader +1 + +## Boot with different /boot partition +## / = /dev/hdb2 = (hd1,1) +## /boot = /dev/hdb1 = (hd1,0) +## +#title CRUX GNU/Linux drive 2 +#kernel (hd1,0)/vmlinuz root=/dev/hdb2 +

1 0

ports/core (2.2): grub: updated to version 0.97
by crux＠crux.nu 30 Nov '06

30 Nov '06

commit e2c875c14eeb3e40af85febf0e60e22bfc93856b Author: Matt Housh <jaeger(a)crux.nu> Date: Wed Nov 29 18:07:17 2006 -0600 grub: updated to version 0.97 diff --git a/grub/.md5sum b/grub/.md5sum index 7c3d581..eb52e38 100644 --- a/grub/.md5sum +++ b/grub/.md5sum @@ -1,5 +1,5 @@ 571ab75bb9f4c247853d93264eda1df4 crux02.xpm.gz 55e343038043e16df5293d63782373d0 crux03.xpm.gz -a74fc336016eca6e22af7158df8433c9 grub-0.95-patches.tar.gz -4ca8e4363d5f1980f2c63b7f5cdbe0d1 grub-0.95.tar.gz +e0fce491c713805650df3d8962ead526 grub-0.97-patches.tar.gz +cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 1f2733522ab27183e3830d93733141ac menu.lst.sample diff --git a/grub/Pkgfile b/grub/Pkgfile index c9a4455..07f9a4c 100644 --- a/grub/Pkgfile +++ b/grub/Pkgfile @@ -5,47 +5,57 @@ # Depends on: ncurses, gettext name=grub -version=0.95 -release=5 +version=0.97 +release=1 source=(ftp://alpha.gnu.org/gnu/grub/$name-$version.tar.gz \ http://crux.nu/files/grub/$version/$name-$version-patches.tar.gz \ - http://crux.nu/files/grub/$version/crux02.xpm.gz \ - http://crux.nu/files/grub/$version/crux03.xpm.gz \ + http://crux.nu/files/grub/common/crux02.xpm.gz \ + http://crux.nu/files/grub/common/crux03.xpm.gz \ menu.lst.sample) build () { cd $name-$version - # Apply Fedora Linux patches + # Apply Fedora Core patches PATCH_LIST=( + 0.93-configfile 0.90-symlinkmenulst - 0.90-install.in + 0.97-install.in 0.94-installcopyonly 0.94-addsyncs - 0.95-endedit + 0.95-staticcurses + 0.93-endedit 0.90-append - 0.93-once + 0.97-once 0.95-graphics 0.91-splashimagehelp 0.93-graphics-bootterm 0.95-hiddenmenu-tweak - 0.95-ext2-sparse 0.93-special-device-names - 0.94-initrdmax 0.94-i2o - 0.95-staticcurses 0.95-moreraid + 0.94-initrdmax 0.95-odirect 0.95-geometry-26kernel 0.95-md 0.95-md-rework 0.95-xpmjunk 0.95-splash-error-term - 0.95-nxstack - 0.95-mdadm-path + 0.97-nxstack + 0.97-nx-multiinstall + 0.97-mdadm-path 0.95-md-mbr - 0.95-gcc4 + 0.97-gcc4 0.95-nonmbr + 0.95-recheck-bad + 0.97-prototypes + 0.97-datadir + 0.97-dmraid + 0.97-dmraid-recheck-bad + 0.97-dmraid-partition-names + 0.97-mactel-kbd + 0.97-stderr + 0.97-mpath ) for PATCH in ${PATCH_LIST[@]} @@ -54,7 +64,7 @@ build () { done # http://lists.gnu.org/archive/html/bug-grub/2005-04/msg00031.html - patch -p0 -i $SRC/$name-patches/$name-$version-xfs-writable-strings.patch + patch -p0 -i $SRC/$name-patches/$name-0.95-xfs-writable-strings.patch unset CXXFLAGS export CFLAGS="-Os"

1 0

ports/xorg (2.2): mesa3d: fixed XCB compatibility bug
by crux＠crux.nu 29 Nov '06

29 Nov '06

commit f8fb943040106b3edab9b4f198d5dcf4254f7861 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Wed Nov 29 18:36:49 2006 +0100 mesa3d: fixed XCB compatibility bug diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum index 3cccf74..e5a7755 100644 --- a/mesa3d/.md5sum +++ b/mesa3d/.md5sum @@ -1,2 +1,3 @@ 0f2794baf7a9d98b22caea9f78c6942d MesaDemos-6.5.1.tar.bz2 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 +5c5c9197cb3ceb7d8598314bdea1581b mesa3d.diff diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 6e23857..d222e32 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -5,12 +5,15 @@ name=mesa3d version=6.5.1 -release=2 -source=(http://dl.sourceforge.net/$name/Mesa{Lib,Demos}-$version.tar.bz2) +release=3 +source=(http://dl.sourceforge.net/$name/Mesa{Lib,Demos}-$version.tar.bz2 \ + $name.diff) build() { cd Mesa-$version + patch -Np1 -i $SRC/$name.diff + cat <<EOF >> configs/linux-dri INSTALL_DIR = $PKG/usr DRI_DRIVER_INSTALL_DIR = $PKG/usr/lib/dri diff --git a/mesa3d/mesa3d.diff b/mesa3d/mesa3d.diff new file mode 100644 index 0000000..3e16766 --- /dev/null +++ b/mesa3d/mesa3d.diff @@ -0,0 +1,16 @@ +diff -aur Mesa-6.5.1.orig/src/glx/x11/glxext.c Mesa-6.5.1/src/glx/x11/glxext.c +--- Mesa-6.5.1.orig/src/glx/x11/glxext.c 2006-08-29 23:45:28.000000000 +0200 ++++ Mesa-6.5.1/src/glx/x11/glxext.c 2006-11-29 18:01:03.219605180 +0100 +@@ -1016,11 +1016,11 @@ + if (!_XReply(dpy, (xReply*) &reply, 0, False)) { + /* Something is busted. Punt. */ + UnlockDisplay(dpy); ++ SyncHandle(); + FreeScreenConfigs(priv); + return GL_FALSE; + } + +- UnlockDisplay(dpy); + if (!reply.numVisuals) { + /* This screen does not support GL rendering */ + UnlockDisplay(dpy);

1 0

ports/xorg (2.2): xorg-rendercheck: updated to 1.2
by crux＠crux.nu 29 Nov '06

29 Nov '06

commit 192a261cc56775cded0eccd0cd7369a841353ddb Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Wed Nov 29 18:05:04 2006 +0100 xorg-rendercheck: updated to 1.2 diff --git a/xorg-rendercheck/.md5sum b/xorg-rendercheck/.md5sum index 0103cf5..4c647eb 100644 --- a/xorg-rendercheck/.md5sum +++ b/xorg-rendercheck/.md5sum @@ -1 +1 @@ -9e4533bec9700bf6b44f1d88ddcbaf2c rendercheck-1.1.tar.bz2 +76ffc65a3b708d380a66823a56b7be15 rendercheck-1.2.tar.bz2 diff --git a/xorg-rendercheck/Pkgfile b/xorg-rendercheck/Pkgfile index 4ad7da2..9c23079 100644 --- a/xorg-rendercheck/Pkgfile +++ b/xorg-rendercheck/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-libxrender name=xorg-rendercheck -version=1.1 +version=1.2 release=1 source=(http://xorg.freedesktop.org/releases/individual/app/rendercheck-$ve…

1 0

ports/opt (2.2): sane: fixed README
by crux＠crux.nu 28 Nov '06

28 Nov '06

commit 926c3b8ea7681d515e05db687fbcb602e18da5b3 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 28 21:54:31 2006 +0100 sane: fixed README diff --git a/sane/README b/sane/README index fb9af43..56c2217 100644 --- a/sane/README +++ b/sane/README @@ -3,8 +3,9 @@ README for sane 1.0.x REQUIREMENTS PRE-INSTALL - 1. If you're using an USB scanner, create the group 'scanner' and - add all users which need access to your device. + 1. Create the group 'scanner' and add all users which need access to your device. + + # groupadd scanner POST-INSTALL 1. To find the vendor/product id of your scanner, run the command:

1 0

ports/core (2.3): ports: updated for 2.3
by crux＠crux.nu 28 Nov '06

28 Nov '06

commit 7f338c78ae711fd817227ad56437ab2b9c85b953 Author: Simone Rota <sip(a)crux.nu> Date: Tue Nov 28 21:09:20 2006 +0000 ports: updated for 2.3 diff --git a/ports/.md5sum b/ports/.md5sum index e68a6c2..938ba75 100644 --- a/ports/.md5sum +++ b/ports/.md5sum @@ -1,4 +1,4 @@ -0f692aaee9aa8083c7f7188314585204 contrib.rsync.inactive -9402d3e729f8bd6cbed27aea984fb108 core.rsync -e357c661f3bb64e6540c4de449095537 opt.rsync +b20d7d4321003d0d1b453d56f4b6c23e contrib.rsync.inactive +2b42daefa2a3de0a6d22a83681dcf782 core.rsync +0730cec292dcbd0d27417e29c19ef816 opt.rsync 1f178e2bb1beab9782993931c9832280 ports-1.5.tar.gz diff --git a/ports/Pkgfile b/ports/Pkgfile index bb997d1..d23028d 100644 --- a/ports/Pkgfile +++ b/ports/Pkgfile @@ -4,7 +4,7 @@ name=ports version=1.5 -release=4 +release=5 source=(http://www.fukt.bsnet.se/~per/crux/files/ports/$name-$version.tar.gz \ core.rsync opt.rsync contrib.rsync.inactive) diff --git a/ports/contrib.rsync.inactive b/ports/contrib.rsync.inactive index 14b050e..af65ea6 100644 --- a/ports/contrib.rsync.inactive +++ b/ports/contrib.rsync.inactive @@ -1,3 +1,3 @@ host=crux.nu -collection=ports/crux-2.2/contrib/ +collection=ports/crux-2.3/contrib/ destination=/usr/ports/contrib diff --git a/ports/core.rsync b/ports/core.rsync index 958c669..de8f743 100644 --- a/ports/core.rsync +++ b/ports/core.rsync @@ -1,3 +1,3 @@ host=crux.nu -collection=ports/crux-2.2/core/ +collection=ports/crux-2.3/core/ destination=/usr/ports/core diff --git a/ports/opt.rsync b/ports/opt.rsync index 7234739..a4de447 100644 --- a/ports/opt.rsync +++ b/ports/opt.rsync @@ -1,3 +1,3 @@ host=crux.nu -collection=ports/crux-2.2/opt/ +collection=ports/crux-2.3/opt/ destination=/usr/ports/opt

1 0

ports/opt (2.2): ngrep: update to 1.45
by crux＠crux.nu 28 Nov '06

28 Nov '06

commit e2b63d2475af05f5a699e2ba7a69f113ebf075a4 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Nov 28 20:18:14 2006 +0100 ngrep: update to 1.45 diff --git a/ngrep/.md5sum b/ngrep/.md5sum index bd99c0c..cd5b5eb 100644 --- a/ngrep/.md5sum +++ b/ngrep/.md5sum @@ -1 +1 @@ -8a142d74043609b09ed57d3baadb2fd6 ngrep-1.44.tar.bz2 +bc8150331601f3b869549c94866b4f1c ngrep-1.45.tar.bz2 diff --git a/ngrep/Pkgfile b/ngrep/Pkgfile index 28f7a0d..1029d8f 100644 --- a/ngrep/Pkgfile +++ b/ngrep/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcap name=ngrep -version=1.44 +version=1.45 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)

1 0