March 2008 - crux-commits

ports/opt (2.4): libglade: removed redundant deps
by crux＠crux.nu 25 Mar '08

25 Mar '08

commit 0e93840af7a9127851e785a90823ffc35e0eac2f Author: Lucas Hazel <lucas(a)die.net.au> Date: Wed Mar 26 09:37:26 2008 +1100 libglade: removed redundant deps diff --git a/libglade/Pkgfile b/libglade/Pkgfile index 75019a1..a414725 100644 --- a/libglade/Pkgfile +++ b/libglade/Pkgfile @@ -2,7 +2,7 @@ # URL: http://glade.gnome.org/ # Maintainer: Lucas Hazel, lucas at die dot net dot au # Packager: Matt Housh, jaeger at morpheus dot net -# Depends on: glib, atk, gtk, libxml2, python, pkg-config +# Depends on: gtk, python, pkg-config # Group: gnome name=libglade

1 0

ports/xorg (2.4): xorg-xf86-video-amd: updated to 2.7.7.7.
by crux＠crux.nu 25 Mar '08

25 Mar '08

commit 9db420ad3c2ae927e013ad254067896588567129 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Tue Mar 25 17:35:29 2008 +0100 xorg-xf86-video-amd: updated to 2.7.7.7. diff --git a/xorg-xf86-video-amd/.md5sum b/xorg-xf86-video-amd/.md5sum index 166a6ac..bd4ddc8 100644 --- a/xorg-xf86-video-amd/.md5sum +++ b/xorg-xf86-video-amd/.md5sum @@ -1 +1 @@ -e839cc4552032b7bd44beb72e575980f xf86-video-amd-2.7.7.6.tar.bz2 +2f3e8c3019afda926e7ab95b074c35e1 xf86-video-amd-2.7.7.7.tar.bz2 diff --git a/xorg-xf86-video-amd/Pkgfile b/xorg-xf86-video-amd/Pkgfile index e8aac9d..23677ef 100644 --- a/xorg-xf86-video-amd/Pkgfile +++ b/xorg-xf86-video-amd/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Tilman Sauerbeck, tilman at crux dot nu name=xorg-xf86-video-amd -version=2.7.7.6 +version=2.7.7.7 release=1 source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-a…

1 0

ports/opt (2.4): nmap: updated to 4.60 (thanks pedja)
by crux＠crux.nu 25 Mar '08

25 Mar '08

commit d6fa537f092e5d5a19b6811c8e5cfe300be8175d Author: Simone Rota <sip(a)crux.nu> Date: Tue Mar 25 16:04:38 2008 +0000 nmap: updated to 4.60 (thanks pedja) diff --git a/nmap/.footprint b/nmap/.footprint index 1a25e5a..9767f1f 100644 --- a/nmap/.footprint +++ b/nmap/.footprint @@ -19,6 +19,7 @@ drwxr-xr-x root/root usr/share/nmap/ -rw-r--r-- root/root usr/share/nmap/nmap.dtd -rw-r--r-- root/root usr/share/nmap/nmap.xsl drwxr-xr-x root/root usr/share/nmap/nselib/ +-rw-r--r-- root/root usr/share/nmap/nselib/http.lua -rw-r--r-- root/root usr/share/nmap/nselib/ipOps.lua -rw-r--r-- root/root usr/share/nmap/nselib/listop.lua -rw-r--r-- root/root usr/share/nmap/nselib/match.lua @@ -26,6 +27,7 @@ drwxr-xr-x root/root usr/share/nmap/nselib/ -rw-r--r-- root/root usr/share/nmap/nselib/shortport.lua -rw-r--r-- root/root usr/share/nmap/nselib/stdnse.lua -rw-r--r-- root/root usr/share/nmap/nselib/strbuf.lua +-rw-r--r-- root/root usr/share/nmap/nselib/tab.lua -rw-r--r-- root/root usr/share/nmap/nselib/url.lua drwxr-xr-x root/root usr/share/nmap/scripts/ -rw-r--r-- root/root usr/share/nmap/scripts/HTTPAuth.nse diff --git a/nmap/.md5sum b/nmap/.md5sum index cd5875d..4f50147 100644 --- a/nmap/.md5sum +++ b/nmap/.md5sum @@ -1 +1 @@ -bb203c47f3c234b61d3c4916da7eaa27 nmap-4.53.tar.bz2 +6201551054050c11182fd6dd91682cb1 nmap-4.60.tar.bz2 diff --git a/nmap/Pkgfile b/nmap/Pkgfile index 3f84a22..c2bf0a4 100644 --- a/nmap/Pkgfile +++ b/nmap/Pkgfile @@ -1,21 +1,22 @@ # Description: Utility for network exploration or security auditing -# URL: http://www.insecure.org/nmap +# URL: http://nmap.org # Maintainer: Simone Rota, sip at crux dot nu # Packager: sten, nick dot steeves at shaw dot ca name=nmap -version=4.53 -release=2 -source=(http://download.insecure.org/$name/dist/$name-$version.tar.bz2) +version=4.60 +release=1 +source=(http://nmap.org/dist/$name-$version.tar.bz2) + build () { cd $name-$version - ./configure --prefix=/usr --libexecdir=/usr/lib \ + ./configure --prefix=/usr --libexecdir=/usr/lib --mandir=/usr/man \ --with-libpcre=included --with-liblua=included \ --with-libpcap=included --without-zenmap make make DESTDIR=$PKG install - #install -m 644 docs/zenmap.1 $PKG/usr/man/man1 - rm -rf $PKG/usr/bin/uninstall_zenmap - rm -rf $PKG/usr/share/zenmap/{locale,docs} + rm -rf $PKG/usr/man/man1/zenmap.* + + }

1 0

ports/core (2.4): udev: updated to 119.
by crux＠crux.nu 25 Mar '08

25 Mar '08

commit f5858caa2ef9eaa3283d817cd15230c42e0b4bad Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Tue Mar 25 08:42:32 2008 +0100 udev: updated to 119. diff --git a/udev/.footprint b/udev/.footprint index 35c6ea1..b35ef0f 100644 --- a/udev/.footprint +++ b/udev/.footprint @@ -1,4 +1,3 @@ -drwxr-xr-x root/root dev/ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/scsi_id.config drwxr-xr-x root/root etc/udev/ diff --git a/udev/.md5sum b/udev/.md5sum index 6154869..cfc166c 100644 --- a/udev/.md5sum +++ b/udev/.md5sum @@ -1,5 +1,5 @@ c0da74341672681c9bd924439ea4e84d cdrom.rules cbb9848e6c3662c966edaed90ce90c3f cdsymlinks 40ab559668ab739473fa9f4a45ba28da start_udev -39ab2404464c7026c65eb878827192b9 udev-118.tar.bz2 +dd299c16371c9e14e52d79744bccf4c0 udev-119.tar.bz2 a521a256799fcba14f2f15cacec48a9f udev-config-20080217.tar.bz2 diff --git a/udev/Pkgfile b/udev/Pkgfile index 349bea6..a073dd8 100644 --- a/udev/Pkgfile +++ b/udev/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=udev -version=118 +version=119 release=1 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.… \ http://crux.nu/files/distfiles/udev-config-20080217.tar.bz2 \

1 0

ports/core (2.4): wget: updated to 1.11.1.
by crux＠crux.nu 25 Mar '08

25 Mar '08

commit b67df76adbaeb9c693ac83c92d59e99654ef4c7d Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Tue Mar 25 08:14:50 2008 +0100 wget: updated to 1.11.1. diff --git a/wget/.md5sum b/wget/.md5sum index d0401c2..a87b0f0 100644 --- a/wget/.md5sum +++ b/wget/.md5sum @@ -1,2 +1,2 @@ -b0a4d178672df06435fcbded07cfc054 wget-1.11.tar.gz +9ce16ff30a236e474e3c19d988e1f119 wget-1.11.1.tar.gz fa717c9970a09e8ee1775a93e51fb694 wgetrc diff --git a/wget/Pkgfile b/wget/Pkgfile index ebf3e32..ea997a2 100644 --- a/wget/Pkgfile +++ b/wget/Pkgfile @@ -5,7 +5,7 @@ # Depends on: openssl name=wget -version=1.11 +version=1.11.1 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \ wgetrc)

1 0

ports/opt (2.4): libxvid: Add missing patch.
by crux＠crux.nu 24 Mar '08

24 Mar '08

commit 952061c2c38a8f936832256165761b4225160dd4 Author: Brett Goulder <predatorfreak(a)dcaf-security.org> Date: Mon Mar 24 18:47:52 2008 -0400 libxvid: Add missing patch. diff --git a/libxvid/libxvid-1.1.3-nasm-compat.patch b/libxvid/libxvid-1.1.3-nasm-compat.patch new file mode 100644 index 0000000..bd1b417 --- /dev/null +++ b/libxvid/libxvid-1.1.3-nasm-compat.patch @@ -0,0 +1,175 @@ +Index: src/dct/x86_asm/fdct_mmx_skal.asm +=================================================================== +RCS file: /xvid/xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm,v +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -r1.6 -r1.7 +--- src/dct/x86_asm/fdct_mmx_skal.asm 29 Aug 2004 10:02:38 -0000 1.6 ++++ src/dct/x86_asm/fdct_mmx_skal.asm 11 Sep 2007 12:41:13 -0000 1.7 +@@ -378,9 +378,9 @@ + paddd mm2, mm3 ; [ out0 | out1 ] + pmaddwd mm7, mm1 ; [a0.M10+a1.M11 | b0.M26+b1.M27] + psrad mm2, 16 +- pmaddwd mm0, qword [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29] ++ pmaddwd mm0, [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29] + paddd mm4, mm5 ; [ out2 | out3 ] +- pmaddwd mm1, qword [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31] ++ pmaddwd mm1, [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31] + psrad mm4, 16 + + paddd mm6, mm7 ; [ out4 | out5 ] +@@ -436,9 +436,9 @@ + paddd mm2, mm3 ; [ out0 | out1 ] + pmaddwd mm7, mm1 ; [a0.M10+a1.M11 | b0.M26+b1.M27] + psrad mm2, 16 +- pmaddwd mm0, qword [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29] ++ pmaddwd mm0, [%3 + 48] ; [a0.M12+a1.M13 | b0.M28+b1.M29] + paddd mm4, mm5 ; [ out2 | out3 ] +- pmaddwd mm1, qword [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31] ++ pmaddwd mm1, [%3 + 56] ; [a0.M14+a1.M15 | b0.M30+b1.M31] + psrad mm4, 16 + + paddd mm6, mm7 ; [ out4 | out5 ] +Index: src/image/x86_asm/interpolate8x8_3dne.asm +=================================================================== +RCS file: /xvid/xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm,v +retrieving revision 1.7 +retrieving revision 1.8 +diff -u -r1.7 -r1.8 +--- src/image/x86_asm/interpolate8x8_3dne.asm 13 Sep 2005 12:12:15 -0000 1.7 ++++ src/image/x86_asm/interpolate8x8_3dne.asm 11 Sep 2007 12:41:13 -0000 1.8 +@@ -97,7 +97,13 @@ + %if (%1) + movq mm0, [eax] + %else +- movq mm0, [dword eax] ++ movq mm0, [eax+0] ++ ; --- ++ ; nasm >0.99.x rejects the original statement: ++ ; movq mm0, [dword eax] ++ ; as it is ambiguous. for this statement nasm <0.99.x would ++ ; generate "movq mm0,[eax+0]" ++ ; --- + %endif + pavgb mm0, [eax+1] + movq mm1, [eax+edx] +Index: src/motion/x86_asm/sad_3dne.asm +=================================================================== +RCS file: /xvid/xvidcore/src/motion/x86_asm/sad_3dne.asm,v +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -r1.6 -r1.7 +--- src/motion/x86_asm/sad_3dne.asm 29 Aug 2004 10:02:38 -0000 1.6 ++++ src/motion/x86_asm/sad_3dne.asm 11 Sep 2007 12:41:13 -0000 1.7 +@@ -180,7 +180,7 @@ + movq mm1, [eax+2*ecx+8] + psadbw mm3, mm4 + +- movq mm0, [dword eax+edx] ++ movq mm0, [eax+edx+0] + psadbw mm2, mm4 + add eax, edx + psadbw mm1, mm4 +Index: src/quant/x86_asm/quantize_h263_3dne.asm +=================================================================== +RCS file: /xvid/xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -r1.5 -r1.6 +--- src/quant/x86_asm/quantize_h263_3dne.asm 29 Aug 2004 10:02:38 -0000 1.5 ++++ src/quant/x86_asm/quantize_h263_3dne.asm 11 Sep 2007 12:41:13 -0000 1.6 +@@ -396,7 +396,7 @@ + + quant_intra1 3 + psubw mm5, mm4 ;C8 +- mov esi, [dword esp + 12] ; pop back the register value ++ mov esi, [esp + 12] ; pop back the register value + mov edi, [esp + 4] ; pop back the register value + sar eax, 16 + lea ebx, [byte eax + 1] ; workaround for eax < 0 +@@ -755,7 +755,7 @@ + pmaxsw mm2, mm3 ;|c| ;B4 (2nd) + pmullw mm2, [edi] ;*= 2Q ;B8 (3rd+) + psraw mm3, 15 ; sign(c) ;B7 (2nd) +- mov edx, [dword esp+ 4+12] ; data ++ mov edx, [esp+ 4+12] ; data + + ALIGN 8 + +Index: src/utils/x86_asm/mem_transfer_3dne.asm +=================================================================== +RCS file: /xvid/xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm,v +retrieving revision 1.7 +retrieving revision 1.8 +diff -u -r1.7 -r1.8 +--- src/utils/x86_asm/mem_transfer_3dne.asm 13 Sep 2005 12:12:15 -0000 1.7 ++++ src/utils/x86_asm/mem_transfer_3dne.asm 11 Sep 2007 12:41:13 -0000 1.8 +@@ -254,7 +254,7 @@ + mov eax, [esp + 8] ; Cur + mov ecx, [esp +12] ; Ref + push edi +- mov edx, [dword esp+4+16] ; Stride ++ mov edx, [esp+4+16] ; Stride + mov edi, [esp+4+ 4] ; Dst + pxor mm7, mm7 + nop +@@ -272,7 +272,7 @@ + mov eax, [esp + 8] ; Cur + mov ecx, [esp +12] ; Ref + push edi +- mov edx, [dword esp+4+16] ; Stride ++ mov edx, [esp+4+16] ; Stride + mov edi, [esp+4+ 4] ; Dst + pxor mm7, mm7 + nop +Index: build/generic/configure.in +=================================================================== +RCS file: /xvid/xvidcore/build/generic/configure.in,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -r1.22 -r1.23 +--- build/generic/configure.in 21 Dec 2006 23:29:27 -0000 1.22 ++++ build/generic/configure.in 23 Nov 2007 10:44:11 -0000 1.23 +@@ -17,6 +17,8 @@ + + dnl NASM version requirement + minimum_nasm_patch_version=34 ++minimum_nasm_minor_version=99 ++minimum_nasm_major_version=2 + nasm_prog="nasm" + yasm_prog="yasm" + +@@ -364,14 +366,31 @@ + dnl + AC_MSG_CHECKING([for nasm patch version]) + nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1` ++ nasm_minor=`$nasm_prog -v | cut -d '.' -f 2 | cut -d ' ' -f 1` ++ nasm_major=`$nasm_prog -v | cut -d '.' -f 1 | cut -d ' ' -f 3` + if test -z $nasm_patch ; then + nasm_patch=-1 + fi ++ if test -z $nasm_minor ; then ++ nasm_minor=-1 ++ fi ++ if test -z $nasm_major ; then ++ nasm_major=-1 ++ fi + AC_MSG_RESULT([$nasm_patch]) + +- + if test "$nasm_patch" -lt "$minimum_nasm_patch_version" ; then +- AC_MSG_WARN([nasm patch version is too old]) ++ if test "$nasm_minor" -lt "$minimum_nasm_minor_version" ; then ++ if test "$nasm_major" -lt "$minimum_nasm_major_version" ; then ++ AC_MSG_WARN([nasm version is too old]) ++ else ++ found_nasm_comp_prog="yes" ++ chosen_asm_prog="$nasm_prog" ++ fi ++ else ++ found_nasm_comp_prog="yes" ++ chosen_asm_prog="$nasm_prog" ++ fi + else + found_nasm_comp_prog="yes" + chosen_asm_prog="$nasm_prog"

1 0

ports/opt (2.4): libxvid: Fix nasm compatibility so that libxvid is built with proper assembly code optimisations.
by crux＠crux.nu 24 Mar '08

24 Mar '08

commit 4bae2831a1359c886d47d085dfc0931eada4452b Author: Brett Goulder <predatorfreak(a)dcaf-security.org> Date: Mon Mar 24 13:58:15 2008 -0400 libxvid: Fix nasm compatibility so that libxvid is built with proper assembly code optimisations. diff --git a/libxvid/.md5sum b/libxvid/.md5sum index 82597b8..f9bfb8b 100644 --- a/libxvid/.md5sum +++ b/libxvid/.md5sum @@ -1 +1,2 @@ +c3a80380d73c6f5b1998c05189ccd285 libxvid-1.1.3-nasm-compat.patch 29c60d4d991ac18f687a8fd13cfe64b7 xvidcore-1.1.3.tar.bz2 diff --git a/libxvid/Pkgfile b/libxvid/Pkgfile index 8c664d4..e48f265 100644 --- a/libxvid/Pkgfile +++ b/libxvid/Pkgfile @@ -5,12 +5,16 @@ name=libxvid version=1.1.3 -release=1 -source=(http://downloads.xvid.org/downloads/xvidcore-$version.tar.bz2) +release=2 +source=(http://downloads.xvid.org/downloads/xvidcore-$version.tar.bz2 +$name-$version-nasm-compat.patch) build() { mkdir -p $PKG/usr/{include,lib} - cd xvidcore-$version/build/generic/ + cd xvidcore-$version/ + patch -p0 -i $SRC/$name-$version-nasm-compat.patch + cd build/generic/ + autoconf ./configure --prefix=/usr make make includedir=$PKG/usr/include libdir=$PKG/usr/lib install

1 0

ports/opt (2.4): conky: update to 1.5.0
by crux＠crux.nu 24 Mar '08

24 Mar '08

commit 11c55d33820bd9aac6790192196d4e9265d20e0b Author: Juergen Daubert <jue(a)jue.li> Date: Mon Mar 24 10:29:47 2008 +0100 conky: update to 1.5.0 diff --git a/conky/.md5sum b/conky/.md5sum index 0adf72c..7a7b879 100644 --- a/conky/.md5sum +++ b/conky/.md5sum @@ -1 +1,2 @@ -42d966fce5aa5c5a326575ec214bff07 conky-1.4.9.tar.bz2 +881c419371021f42ca12b621a8548b66 conky-1.5.0.patch +07fa339276289ddc31303a8081c85214 conky-1.5.0.tar.bz2 diff --git a/conky/Pkgfile b/conky/Pkgfile index 9f8ab45..e02f2bc 100644 --- a/conky/Pkgfile +++ b/conky/Pkgfile @@ -4,12 +4,14 @@ # Depends on: glib, xorg-libxdamage, xorg-libxext, xorg-libxft name=conky -version=1.4.9 +version=1.5.0 release=1 -source=(http://dl.sourceforge.net/sourceforge/conky/$name-$version.tar.bz2) +source=(http://dl.sourceforge.net/sourceforge/conky/$name-$version.tar.bz2 \ + $name-$version.patch) build() { cd $name-$version + patch -p2 -i $SRC/$name-$version.patch ./configure --prefix=/usr \ --mandir=/usr/man \ --disable-nls \ diff --git a/conky/conky-1.5.0.patch b/conky/conky-1.5.0.patch new file mode 100644 index 0000000..94bb46c --- /dev/null +++ b/conky/conky-1.5.0.patch @@ -0,0 +1,14 @@ +https://sourceforge.net/tracker/?func=detail&atid=757308&aid=1923552&group_id=143975 + +--- trunk/conky1/src/linux.c 2008/03/22 21:10:43 1034 ++++ trunk/conky1/src/linux.c 2008/03/24 03:38:28 1042 +@@ -52,6 +52,9 @@ + #include <linux/sockios.h> + #include <net/if.h> + #include <arpa/inet.h> ++#ifdef _NET_IF_H ++#define _LINUX_IF_H ++#endif + #include <linux/route.h> + #include <math.h> +

1 0

ports/opt (2.4): sqlite3: update to 3.5.7
by crux＠crux.nu 24 Mar '08

24 Mar '08

commit b691edea1ffae41ea9191149efd96ea481fde172 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Mar 24 10:28:37 2008 +0100 sqlite3: update to 3.5.7 diff --git a/sqlite3/.md5sum b/sqlite3/.md5sum index 6d963c7..145f42f 100644 --- a/sqlite3/.md5sum +++ b/sqlite3/.md5sum @@ -1 +1 @@ -903c9e935c538af392364a9172a3d98d sqlite-3.5.6.tar.gz +8e4b8c7192c045a4a68c9f4d5cfab8a8 sqlite-3.5.7.tar.gz diff --git a/sqlite3/Pkgfile b/sqlite3/Pkgfile index 3edfb52..ae1b4e7 100644 --- a/sqlite3/Pkgfile +++ b/sqlite3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses, readline name=sqlite3 -version=3.5.6 +version=3.5.7 release=1 source=(http://www.sqlite.org/sqlite-$version.tar.gz)

1 0

ports/opt (2.4): grub: When the boot partition is mounted, you should use --stage2, as explained in the GRUB manual.
by crux＠crux.nu 23 Mar '08

23 Mar '08

commit 688b6751172efec9853806df401574389692224e Author: Brett Goulder <predatorfreak(a)dcaf-security.org> Date: Sun Mar 23 09:08:02 2008 -0400 grub: When the boot partition is mounted, you should use --stage2, as explained in the GRUB manual. diff --git a/grub/README b/grub/README index 82adc04..97ddcfc 100644 --- a/grub/README +++ b/grub/README @@ -47,10 +47,12 @@ POST-INSTALL Last but not least, install/enable the boot manager: + # # If the boot partition is mounted, you must specify --stage2, like below. + # # Otherwise, you may remove this. # # Run grub # grub grub> root (hdX,Y) - grub> setup (hdX) + grub> setup --stage2=/boot/grub/stage2 (hdX) grub> quit Please correct the path and device names according to your configuration. Also

1 0