August 2006 - crux-commits

r1795 - in crux-2.2/ports/opt: . ruby-musicbrainz
by crux＠crux.nu 31 Aug '06

31 Aug '06

Author: tilman Date: 2006-08-31 17:46:31 +0200 (Thu, 31 Aug 2006) New Revision: 1795 Added: crux-2.2/ports/opt/ruby-musicbrainz/ crux-2.2/ports/opt/ruby-musicbrainz/.footprint crux-2.2/ports/opt/ruby-musicbrainz/.md5sum crux-2.2/ports/opt/ruby-musicbrainz/Pkgfile Log: ruby-musicbrainz: initial release Added: crux-2.2/ports/opt/ruby-musicbrainz/.footprint =================================================================== --- crux-2.2/ports/opt/ruby-musicbrainz/.footprint (rev 0) +++ crux-2.2/ports/opt/ruby-musicbrainz/.footprint 2006-08-31 15:46:31 UTC (rev 1795) @@ -0,0 +1,7 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/ruby/ +drwxr-xr-x root/root usr/lib/ruby/site_ruby/ +drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/ +drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/ +-rwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/musicbrainz.so Added: crux-2.2/ports/opt/ruby-musicbrainz/.md5sum =================================================================== --- crux-2.2/ports/opt/ruby-musicbrainz/.md5sum (rev 0) +++ crux-2.2/ports/opt/ruby-musicbrainz/.md5sum 2006-08-31 15:46:31 UTC (rev 1795) @@ -0,0 +1 @@ +eb3815d4b363069165de97c99ad31d11 mb-ruby-0.3.0.tar.gz Added: crux-2.2/ports/opt/ruby-musicbrainz/Pkgfile =================================================================== --- crux-2.2/ports/opt/ruby-musicbrainz/Pkgfile (rev 0) +++ crux-2.2/ports/opt/ruby-musicbrainz/Pkgfile 2006-08-31 15:46:31 UTC (rev 1795) @@ -0,0 +1,18 @@ +# Description: Ruby bindings for libmusicbrainz +# URL: http://www.pablotron.org/software/mb-ruby/ +# Maintainer: Tilman Sauerbeck, tilman at crux nu +# Depends on: ruby, libmusicbrainz + +name=ruby-musicbrainz +version=0.3.0 +release=1 +source=(http://pablotron.org/download/mb-ruby-$version.tar.gz) + +build () { + cd mb-ruby-$version + + ruby extconf.rb + make + + make DESTDIR=$PKG install +} Property changes on: crux-2.2/ports/opt/ruby-musicbrainz/Pkgfile ___________________________________________________________________ Name: svn:keywords + Id

1 0

r1794 - crux-2.2/ports/core/iptables
by crux＠crux.nu 31 Aug '06

31 Aug '06

Author: jw Date: 2006-08-31 17:39:05 +0200 (Thu, 31 Aug 2006) New Revision: 1794 Modified: crux-2.2/ports/core/iptables/.footprint crux-2.2/ports/core/iptables/Pkgfile Log: iptables: install header ipq stuff (fixes bug#91) Modified: crux-2.2/ports/core/iptables/.footprint =================================================================== --- crux-2.2/ports/core/iptables/.footprint 2006-08-31 07:02:58 UTC (rev 1793) +++ crux-2.2/ports/core/iptables/.footprint 2006-08-31 15:39:05 UTC (rev 1794) @@ -1,4 +1,6 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/libipq.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/iptables/ -rwxr-xr-x root/root usr/lib/iptables/libip6t_CONNMARK.so @@ -82,7 +84,21 @@ -rwxr-xr-x root/root usr/lib/iptables/libipt_ttl.so -rwxr-xr-x root/root usr/lib/iptables/libipt_udp.so -rwxr-xr-x root/root usr/lib/iptables/libipt_unclean.so +-rw-r--r-- root/root usr/lib/libipq.a +-rw-r--r-- root/root usr/lib/libiptc.a drwxr-xr-x root/root usr/man/ +drwxr-xr-x root/root usr/man/man3/ +-rw-r--r-- root/root usr/man/man3/ipq_create_handle.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_destroy_handle.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_errstr.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_get_msgerr.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_get_packet.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_message_type.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_perror.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_read.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_set_mode.3.gz +-rw-r--r-- root/root usr/man/man3/ipq_set_verdict.3.gz +-rw-r--r-- root/root usr/man/man3/libipq.3.gz drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/ip6tables.8.gz -rw-r--r-- root/root usr/man/man8/iptables-restore.8.gz Modified: crux-2.2/ports/core/iptables/Pkgfile =================================================================== --- crux-2.2/ports/core/iptables/Pkgfile 2006-08-31 07:02:58 UTC (rev 1793) +++ crux-2.2/ports/core/iptables/Pkgfile 2006-08-31 15:39:05 UTC (rev 1794) @@ -4,11 +4,11 @@ name=iptables version=1.3.5 -release=1 +release=2 source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2) build () { cd $name-$version make KERNEL_DIR=/usr PREFIX=/usr - make KERNEL_DIR=/usr PREFIX=/usr DESTDIR=$PKG install + make KERNEL_DIR=/usr PREFIX=/usr DESTDIR=$PKG install install-devel }

1 0

r1793 - crux-2.2/ports/opt/ffmpeg
by crux＠crux.nu 31 Aug '06

31 Aug '06

Author: jw Date: 2006-08-31 09:02:58 +0200 (Thu, 31 Aug 2006) New Revision: 1793 Modified: crux-2.2/ports/opt/ffmpeg/.md5sum crux-2.2/ports/opt/ffmpeg/Pkgfile Log: ffmpeg: fix source url Modified: crux-2.2/ports/opt/ffmpeg/.md5sum =================================================================== --- crux-2.2/ports/opt/ffmpeg/.md5sum 2006-08-30 13:53:40 UTC (rev 1792) +++ crux-2.2/ports/opt/ffmpeg/.md5sum 2006-08-31 07:02:58 UTC (rev 1793) @@ -1 +1 @@ -f5ea3dd877c5df5b60356053642cf542 FFMpeg-20050806.tar.bz2 +f5ea3dd877c5df5b60356053642cf542 FFmpeg-20050806.tar.bz2 Modified: crux-2.2/ports/opt/ffmpeg/Pkgfile =================================================================== --- crux-2.2/ports/opt/ffmpeg/Pkgfile 2006-08-30 13:53:40 UTC (rev 1792) +++ crux-2.2/ports/opt/ffmpeg/Pkgfile 2006-08-31 07:02:58 UTC (rev 1793) @@ -7,7 +7,7 @@ name=ffmpeg version=20050806 release=1 -source=(http://www2.mplayerhq.hu/MPlayer/cvs/FFMpeg-$version.tar.bz2) +source=(http://www1.mplayerhq.hu/MPlayer/old_stuff/snapshots/FFmpeg/2005/FFmpeg-$version.tar.bz2) build() { cd FFMpeg-$version

1 0

r1792 - crux-2.2/ports/opt/nvidia
by crux＠crux.nu 30 Aug '06

30 Aug '06

Author: jaeger Date: 2006-08-30 15:53:40 +0200 (Wed, 30 Aug 2006) New Revision: 1792 Modified: crux-2.2/ports/opt/nvidia/.footprint crux-2.2/ports/opt/nvidia/.md5sum crux-2.2/ports/opt/nvidia/Pkgfile Log: nvidia: updated to version 1.0-8774 Modified: crux-2.2/ports/opt/nvidia/.footprint =================================================================== --- crux-2.2/ports/opt/nvidia/.footprint 2006-08-30 06:05:49 UTC (rev 1791) +++ crux-2.2/ports/opt/nvidia/.footprint 2006-08-30 13:53:40 UTC (rev 1792) @@ -9,13 +9,13 @@ drwxr-xr-x root/root usr/X11R6/ drwxr-xr-x root/root usr/X11R6/lib/ -r--r--r-- root/root usr/X11R6/lib/libXvMCNVIDIA.a --rwxr-xr-x root/root usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8762 +-rwxr-xr-x root/root usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8774 drwxr-xr-x root/root usr/X11R6/lib/modules/ drwxr-xr-x root/root usr/X11R6/lib/modules/drivers/ -rwxr-xr-x root/root usr/X11R6/lib/modules/drivers/nvidia_drv.o -rwxr-xr-x root/root usr/X11R6/lib/modules/drivers/nvidia_drv.so drwxr-xr-x root/root usr/X11R6/lib/modules/extensions/ --rwxr-xr-x root/root usr/X11R6/lib/modules/extensions/libglx.so.1.0.8762 +-rwxr-xr-x root/root usr/X11R6/lib/modules/extensions/libglx.so.1.0.8774 drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/nvidia-settings -rwxr-xr-x root/root usr/bin/nvidia-xconfig @@ -28,12 +28,12 @@ -r--r--r-- root/root usr/include/nvidia/GL/glxext.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libGL.la --rwxr-xr-x root/root usr/lib/libGL.so.1.0.8762 --rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.8762 --rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.8762 --rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.8762 +-rwxr-xr-x root/root usr/lib/libGL.so.1.0.8774 +-rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.8774 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.8774 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.8774 drwxr-xr-x root/root usr/lib/tls/ --rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.8762 +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.8774 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/nvidia-settings.1.gz Modified: crux-2.2/ports/opt/nvidia/.md5sum =================================================================== --- crux-2.2/ports/opt/nvidia/.md5sum 2006-08-30 06:05:49 UTC (rev 1791) +++ crux-2.2/ports/opt/nvidia/.md5sum 2006-08-30 13:53:40 UTC (rev 1792) @@ -1,2 +1,2 @@ -1c2e02dce7441a01bf4c7033ed867576 NVIDIA-Linux-x86-1.0-8762-pkg0.run +33950a867c2d45014191025dc789476f NVIDIA-Linux-x86-1.0-8774-pkg0.run 544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch Modified: crux-2.2/ports/opt/nvidia/Pkgfile =================================================================== --- crux-2.2/ports/opt/nvidia/Pkgfile 2006-08-30 06:05:49 UTC (rev 1791) +++ crux-2.2/ports/opt/nvidia/Pkgfile 2006-08-30 13:53:40 UTC (rev 1792) @@ -6,7 +6,7 @@ # Nice to have: gl-select name=nvidia -version=1.0-8762 +version=1.0-8774 release=1 source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-… \ $name-makefile.patch)

1 0

r1791 - crux-2.2/ports/opt/mpg123
by crux＠crux.nu 30 Aug '06

30 Aug '06

Author: jue Date: 2006-08-30 08:05:49 +0200 (Wed, 30 Aug 2006) New Revision: 1791 Removed: crux-2.2/ports/opt/mpg123/mpg123-0.59s-security.patch crux-2.2/ports/opt/mpg123/mpg123-0.59s.patch Modified: crux-2.2/ports/opt/mpg123/.md5sum crux-2.2/ports/opt/mpg123/Pkgfile Log: mpg123: update to 0.60 Modified: crux-2.2/ports/opt/mpg123/.md5sum =================================================================== --- crux-2.2/ports/opt/mpg123/.md5sum 2006-08-29 19:56:37 UTC (rev 1790) +++ crux-2.2/ports/opt/mpg123/.md5sum 2006-08-30 06:05:49 UTC (rev 1791) @@ -1,3 +1 @@ -9868708990e667b2e14e0de2356c8021 mpg123-0.59s-security.patch -952b8530d13204e493accae02dd81a35 mpg123-0.59s.patch -a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz +9ca4b824d40f8cc85083911e52cf26a7 mpg123-0.60.tar.bz2 Modified: crux-2.2/ports/opt/mpg123/Pkgfile =================================================================== --- crux-2.2/ports/opt/mpg123/Pkgfile 2006-08-29 19:56:37 UTC (rev 1790) +++ crux-2.2/ports/opt/mpg123/Pkgfile 2006-08-30 06:05:49 UTC (rev 1791) @@ -1,18 +1,20 @@ # Description: Commandline MP3 player # URL: http://www.mpg123.de # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de -# Depends on: esound +# Depends on: alsa-lib name=mpg123 -version=0.59s -release=3 -source=(http://www.mpg123.de/$name/$name-pre$version.tar.gz \ - $name-$version-security.patch $name-$version.patch) +version=0.60 +release=1 +source=(http://www.mpg123.de/download/$name-$version.tar.bz2) build() { - cd $name - patch -p1 < $SRC/$name-$version-security.patch - patch -p1 < $SRC/$name-$version.patch - make linux-esd - make PREFIX=$PKG/usr install + cd $name-$version + ./configure --prefix=/usr \ + --with-cpu=i586 \ + --with-optimization=2 \ + --with-audio=alsa \ + --enable-gapless=yes + make + make DESTDIR=$PKG install } Deleted: crux-2.2/ports/opt/mpg123/mpg123-0.59s-security.patch =================================================================== --- crux-2.2/ports/opt/mpg123/mpg123-0.59s-security.patch 2006-08-29 19:56:37 UTC (rev 1790) +++ crux-2.2/ports/opt/mpg123/mpg123-0.59s-security.patch 2006-08-30 06:05:49 UTC (rev 1791) @@ -1,358 +0,0 @@ -### CAN-2003-0577 - -diff -urN mpg123.old/common.c mpg123/common.c ---- mpg123.old/common.c 2001-05-16 09:56:56.000000000 -0700 -+++ mpg123/common.c 2003-09-30 00:31:24.000000000 -0700 -@@ -127,7 +127,7 @@ - return FALSE; - if(!((head>>17)&3)) - return FALSE; -- if( ((head>>12)&0xf) == 0xf) -+ if( ((head>>12)&0xf) == 0xf || ((head>>12)&0xf) == 0) - return FALSE; - if( ((head>>10)&0x3) == 0x3 ) - return FALSE; -@@ -140,7 +140,7 @@ - * -1: giving up - * 1: synched - */ --#define MAX_INPUT_FRAMESIZE 1920 -+#define MAX_INPUT_FRAMESIZE 4096 - #define SYNC_HEAD_MASK 0xffff0000 - #define SYNC_HEAD_MASK_FF 0x0000f000 - #define LOOK_AHEAD_NUM 3 -@@ -579,7 +579,11 @@ - fprintf(stderr,"Sorry, unknown layer type.\n"); - return (0); - } -- -+ if (fr->framesize>MAX_INPUT_FRAMESIZE) { -+ fprintf(stderr,"Frame size too big.\n"); -+ fr->framesize = MAX_INPUT_FRAMESIZE; -+ return 0; -+ } - if(!fr->bitrate_index) { - /* fprintf(stderr,"Warning, Free format not heavily tested: (head %08lx)\n",newhead); */ - fr->framesize = 0; - - -### CAN-2003-0865 - -diff -Nru mpg123.orig/httpget.c mpg123/httpget.c ---- mpg123.orig/httpget.c 2006-06-16 08:04:50.000000000 +0200 -+++ mpg123/httpget.c 2006-06-16 08:05:14.000000000 +0200 -@@ -55,7 +55,7 @@ - #endif - int pos = 0; - -- while(1) { -+ while(maxlen>pos) { - if( read(fileno(f),string+pos,1) == 1) { - pos++; - if(string[pos-1] == '\n') { - -### CAN-2004-0805 - ---- mpg123/layer2.c.orig 2004-09-14 17:15:48.000000000 -0400 -+++ mpg123/layer2.c 2004-09-14 17:18:49.000000000 -0400 -@@ -287,6 +287,12 @@ - fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? - (fr->mode_ext<<2)+4 : fr->II_sblimit; - -+ /* security fix. */ -+ if (fr->jsbound > fr->II_sblimit) { -+ fprintf(stderr, "Truncating stereo boundary to sideband limit.\n"); -+ fr->jsbound=fr->II_sblimit; -+ } -+ - if(stereo == 1 || single == 3) - single = 0; - - - -### CAN-2004-0982 - ---- mpg123-orig/httpget.c 2000-10-30 18:45:12.000000000 +0100 -+++ mpg123-myfix/httpget.c 2006-05-22 02:45:59.000000000 +0200 -@@ -3,6 +3,11 @@ - * - * Oliver Fromme <oliver.fromme(a)heim3.tu-clausthal.de> - * Wed Apr 9 20:57:47 MET DST 1997 -+ * -+ * Modified by Jeremy Huddleston <eradicator(a)gentoo.org> 2004.10.21 per -+ * http://bugs.gentoo.org/show_bug.cgi?id=68343 -+ * http://www.barrossecurity.com/advisories/mpg123_getauthfromurl_bof_advisory… -+ * - */ - - #undef ALSA -@@ -221,12 +226,12 @@ unsigned char *proxyport; - #define ACCEPT_HEAD "Accept: audio/mpeg, audio/x-mpegurl, */*\r\n" - - char *httpauth = NULL; --char httpauth1[256]; -+char *httpauth1 = NULL; - - int http_open (char *url) - { - char *purl, *host, *request, *sptr; -- int linelength; -+ unsigned int linelength, linelengthbase, purl_length; - unsigned long myip; - unsigned char *myport; - int sock; -@@ -270,53 +275,80 @@ int http_open (char *url) - exit(1); - } - -- -- if ((linelength = strlen(url)+200) < 1024) -- linelength = 1024; -- if (!(request = malloc(linelength)) || !(purl = malloc(1024))) { -+ /* -+ * The length of purl is upper bound by 3*strlen(url) + 1 if everything -+ * in it is a space. For HTTP redirections, we need something longer; -+ * 1024 bytes were arbitrarily chosen. -+ */ -+ purl_length = strlen(url) * 3 + 1; -+ if (purl_length < 1024) purl_length = 1024; -+ purl = (char *)malloc(sizeof(char) * purl_length); -+ if (!purl) { - fprintf (stderr, "malloc() failed, out of memory.\n"); - exit (1); - } -- /* -- * 2000-10-21: -- * We would like spaces to be automatically converted to %20's when -- * fetching via HTTP. -- * -- Martin Sj�gren <md9ms(a)mdstud.chalmers.se> -- */ -- if ((sptr = strchr(url, ' ')) == NULL) { -- strncpy (purl, url, 1023); -- purl[1023] = '\0'; -- } -- else { -- int purllength = 0; -- char *urlptr = url; -- purl[0] = '\0'; -- do { -- purllength += sptr-urlptr + 3; -- if (purllength >= 1023) -- break; -- strncat (purl, urlptr, sptr-urlptr); -- //purl[sptr-url] = '\0'; -- strcat (purl, "%20"); -- urlptr = sptr + 1; -- } -- while ((sptr = strchr (urlptr, ' ')) != NULL); -- strcat (purl, urlptr); -- } - -+ /* -+ * 2000-10-21: -+ * We would like spaces to be automatically converted to %20's when -+ * fetching via HTTP. -+ * -- Martin Sj�gren <md9ms(a)mdstud.chalmers.se> -+ */ -+ if ((sptr = strchr(url, ' ')) == NULL) { -+ strcpy (purl, url); -+ } else { -+ char *urlptr = url; -+ purl[0] = '\0'; -+ do { -+ strncat (purl, urlptr, sptr - urlptr); -+ strcat (purl, "%20"); -+ urlptr = sptr + 1; -+ } -+ while ((sptr = strchr (urlptr, ' ')) != NULL); -+ strcat (purl, urlptr); -+ } -+ -+ httpauth1 = (char *)malloc((strlen(purl) + 1) * sizeof(char)); -+ if(!httpauth1) { -+ fprintf(stderr, "malloc() failed, out of memory.\n"); -+ exit(1); -+ } -+ getauthfromURL(purl,httpauth1); -+ -+ /* "GET http://" + 11 -+ * " HTTP/1.0\r\nUser-Agent: <prgName>/<prgVersion>\r\n" 26 + prgName + prgVersion -+ * ACCEPT_HEAD strlen(ACCEPT_HEAD) -+ * "Authorization: Basic \r\n" 23 -+ * "\r\n" 2 -+ */ -+ linelengthbase = 62 + strlen(prgName) + strlen(prgVersion) + strlen(ACCEPT_HEAD); -+ -+ if(httpauth) -+ linelengthbase += (strlen(httpauth) + 1) * 4; - -- getauthfromURL(purl,httpauth1); -+ if(httpauth1) -+ linelengthbase += (strlen(httpauth1) + 1) * 4; - - do { -- strcpy (request, "GET "); - if (proxyip != INADDR_NONE) { -- if (strncasecmp(url, "http://", 7) != 0 && strncasecmp(url,"ftp://", 6) != 0) -- strcat (request, "http://"); -- strcat (request, purl); - myport = proxyport; - myip = proxyip; -- } -- else { -+ -+ linelength = linelengthbase + strlen(purl); -+ if(host) -+ linelength += 9 + strlen(host) + strlen(myport); /* "Host: <host>:<port>\r\n" */ -+ -+ request = (char *)malloc((linelength + 1) * sizeof(char)); -+ if (!request) { -+ fprintf (stderr, "malloc() failed, out of memory.\n"); -+ exit (1); -+ } -+ -+ strcpy (request, "GET "); -+ if (strncasecmp(url, "http://", 7) != 0 && strncasecmp(url,"ftp://", 6) != 0) -+ strcat (request, "http://"); -+ strcat (request, purl); -+ } else { - if (host) { - free(host); - host=NULL; -@@ -325,19 +357,30 @@ int http_open (char *url) - free(proxyport); - proxyport=NULL; - } -- if (!(sptr = url2hostport(purl, &host, &myip, &myport))) { -- fprintf (stderr, "Unknown host \"%s\".\n", -- host ? host : ""); -+ -+ sptr = url2hostport(purl, &host, &myip, &myport); -+ if (!sptr) { -+ fprintf (stderr, "Unknown host \"%s\".\n", host ? host : ""); -+ exit (1); -+ } -+ -+ linelength = linelengthbase + strlen(sptr); -+ if(host) -+ linelength += 9 + strlen(host) + strlen(myport); /* "Host: <host>:<port>\r\n" */ -+ -+ request = (char *)malloc((linelength + 1) * sizeof(char)); -+ if (!request) { -+ fprintf (stderr, "malloc() failed, out of memory.\n"); - exit (1); - } -+ -+ strcpy (request, "GET "); - strcat (request, sptr); - } -- sprintf (request + strlen(request), -- " HTTP/1.0\r\nUser-Agent: %s/%s\r\n", -- prgName, prgVersion); -+ -+ sprintf (request + strlen(request), " HTTP/1.0\r\nUser-Agent: %s/%s\r\n", prgName, prgVersion); - if (host) { -- sprintf(request + strlen(request), -- "Host: %s:%s\r\n", host, myport); -+ sprintf(request + strlen(request), "Host: %s:%s\r\n", host, myport); - #if 0 - free (host); - #endif -@@ -394,15 +437,29 @@ fail: - exit(1); - } - -- if (strlen(httpauth1) || httpauth) { -- char buf[1023]; -+ if (httpauth1 || httpauth) { -+ char *buf; - strcat (request,"Authorization: Basic "); -- if(strlen(httpauth1)) -- encode64(httpauth1,buf); -- else -- encode64(httpauth,buf); -- strcat (request,buf); -+ if(httpauth1) { -+ buf=(char *)malloc((strlen(httpauth1) + 1) * 4 * sizeof(char)); -+ if(!buf) { -+ fprintf(stderr, "Error allocating sufficient memory for http authentication. Exiting."); -+ exit(1); -+ } -+ encode64(httpauth1,buf); -+ free(httpauth1); -+ } else { -+ buf=(char *)malloc((strlen(httpauth) + 1) * 4 * sizeof(char)); -+ if(!buf) { -+ fprintf(stderr, "Error allocating sufficient memory for http authentication. Exiting."); -+ exit(1); -+ } -+ encode64(httpauth,buf); -+ } -+ -+ strcat (request, buf); - strcat (request,"\r\n"); -+ free(buf); - } - strcat (request, "\r\n"); - -@@ -428,16 +485,19 @@ fail: - } - do { - readstring (request, linelength-1, myfile); -- if (!strncmp(request, "Location:", 9)) -- strncpy (purl, request+10, 1023); -+ if (!strncmp(request, "Location:", 9)) { -+ strncpy (purl, request+10, purl_length); -+ purl[purl_length - 1] = 0; -+ } - } while (request[0] != '\r' && request[0] != '\n'); -+ -+ free(request); - } while (relocate && purl[0] && numrelocs++ < 5); - if (relocate) { - fprintf (stderr, "Too many HTTP relocations.\n"); - exit (1); - } -- free (purl); -- free (request); -+ free(purl); - free(host); - free(proxyport); - free(myport); - - -### CAN-2004-0991 - -diff -Naurp mpg123-0.59s.vanilla/layer2.c mpg123/layer2.c ---- mpg123-0.59s.vanilla/layer2.c 2004-12-18 17:53:59.256803488 -0800 -+++ mpg123/layer2.c 2005-01-06 01:28:56.389304770 -0800 -@@ -262,7 +262,7 @@ static void II_select_table(struct frame - { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 }; - static int sblims[5] = { 27 , 30 , 8, 12 , 30 }; - -- if(fr->lsf) -+ if(fr->sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */ - table = 4; - else - table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index]; - - - -### CAN-2004-1284 - -diff -Naur mpg123-0.59s.vanilla/playlist.c mpg123/playlist.c ---- mpg123-0.59s.vanilla/playlist.c 2000-10-25 04:05:26.000000000 -0700 -+++ mpg123/playlist.c 2004-12-18 17:53:34.337908223 -0800 -@@ -110,9 +110,9 @@ - if ((playlist->listnamedir) && (line[0]!='/') && (line[0]!='\\') - && (strncasecmp(line, "http://", 7)) && (strncasecmp(line, - "ftp://",6)) ){ -- strcpy (linetmp, playlist->listnamedir); -- strcat (linetmp, line); -- strcpy (line, linetmp); -+ strncpy (linetmp, playlist->listnamedir, 1023); -+ strncat (linetmp, line, 1023 - strlen(linetmp)); -+ strncpy (line, linetmp, 1023); - } - return 1; - } Deleted: crux-2.2/ports/opt/mpg123/mpg123-0.59s.patch =================================================================== --- crux-2.2/ports/opt/mpg123/mpg123-0.59s.patch 2006-08-29 19:56:37 UTC (rev 1790) +++ crux-2.2/ports/opt/mpg123/mpg123-0.59s.patch 2006-08-30 06:05:49 UTC (rev 1791) @@ -1,38 +0,0 @@ -diff -Nru mpg123.orig/Makefile mpg123/Makefile ---- mpg123.orig/Makefile 2006-06-16 07:13:41.000000000 +0200 -+++ mpg123/Makefile 2006-06-16 07:28:22.000000000 +0200 -@@ -226,11 +226,9 @@ - linux-esd: - $(MAKE) CC=gcc LDFLAGS= \ - AUDIO_LIB='-lesd -laudiofile' \ -- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ -- audio_esd.o' \ -+ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_esd.o term.o' \ - CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \ -- -DOSS -DUSE_ESD \ -- -Wall -O2 -m486 \ -+ -DOSS -DUSE_ESD -DTERM_CONTROL -Wall \ - -fomit-frame-pointer -funroll-all-loops \ - -finline-functions -ffast-math \ - $(RPM_OPT_FLAGS)' \ -diff -Nru mpg123.orig/audio.c mpg123/audio.c ---- mpg123.orig/audio.c 2006-06-16 07:13:41.000000000 +0200 -+++ mpg123/audio.c 2006-06-16 07:27:30.000000000 +0200 -@@ -1,4 +1,4 @@ -- -+#include <stdlib.h> - #include "mpg123.h" - - void audio_info_struct_init(struct audio_info_struct *ai) -diff -Nru mpg123.orig/audio_nas.c mpg123/audio_nas.c ---- mpg123.orig/audio_nas.c 2006-06-16 07:13:41.000000000 +0200 -+++ mpg123/audio_nas.c 2006-06-16 07:27:30.000000000 +0200 -@@ -185,7 +185,7 @@ - info.buf_size = buf_samples * ai->channels * AuSizeofFormat(format); - info.buf = (char *) malloc(info.buf_size); - if (info.buf == NULL) { -- fprintf(stderr, "Unable to allocate input/output buffer of size %ld\n", -+ fprintf(stderr, "Unable to allocate input/output buffer of size %d\n", - info.buf_size); - exit(1); - }

1 0

r1790 - crux-2.2/ports/opt/samhain
by crux＠crux.nu 29 Aug '06

29 Aug '06

Author: jue Date: 2006-08-29 21:56:37 +0200 (Tue, 29 Aug 2006) New Revision: 1790 Modified: crux-2.2/ports/opt/samhain/.md5sum crux-2.2/ports/opt/samhain/Pkgfile Log: samhain: update to 2.2.3 Modified: crux-2.2/ports/opt/samhain/.md5sum =================================================================== --- crux-2.2/ports/opt/samhain/.md5sum 2006-08-29 19:22:00 UTC (rev 1789) +++ crux-2.2/ports/opt/samhain/.md5sum 2006-08-29 19:56:37 UTC (rev 1790) @@ -1 +1 @@ -24d9f7b5043266bed81cb66fd8786212 samhain_signed-2.2.1.tar.gz +3e020ecf3556a59b3dfed2816be46a78 samhain_signed-2.2.3.tar.gz Modified: crux-2.2/ports/opt/samhain/Pkgfile =================================================================== --- crux-2.2/ports/opt/samhain/Pkgfile 2006-08-29 19:22:00 UTC (rev 1789) +++ crux-2.2/ports/opt/samhain/Pkgfile 2006-08-29 19:56:37 UTC (rev 1790) @@ -3,7 +3,7 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=samhain -version=2.2.1 +version=2.2.3 release=1 source=(http://la-samhna.de/$name/${name}_signed-$version.tar.gz)

1 0

r1789 - crux-2.2/ports/opt/thunderbird
by crux＠crux.nu 29 Aug '06

29 Aug '06

Author: jaeger Date: 2006-08-29 21:22:00 +0200 (Tue, 29 Aug 2006) New Revision: 1789 Modified: crux-2.2/ports/opt/thunderbird/.footprint crux-2.2/ports/opt/thunderbird/.md5sum crux-2.2/ports/opt/thunderbird/Pkgfile Log: [security] thunderbird: updated to version 1.5.0.5, see http://www.mozilla.org/projects/security/known-vulnerabilities.html#thunder… (thanks sip) Modified: crux-2.2/ports/opt/thunderbird/.footprint =================================================================== --- crux-2.2/ports/opt/thunderbird/.footprint 2006-08-29 16:27:08 UTC (rev 1788) +++ crux-2.2/ports/opt/thunderbird/.footprint 2006-08-29 19:22:00 UTC (rev 1789) @@ -88,7 +88,6 @@ -rw-r--r-- root/root usr/lib/thunderbird/components/gfx.xpt -rw-r--r-- root/root usr/lib/thunderbird/components/history.xpt -rw-r--r-- root/root usr/lib/thunderbird/components/htmlparser.xpt --rw-r--r-- root/root usr/lib/thunderbird/components/imgicon.xpt -rw-r--r-- root/root usr/lib/thunderbird/components/imglib2.xpt -rw-r--r-- root/root usr/lib/thunderbird/components/impComm4xMail.xpt -rw-r--r-- root/root usr/lib/thunderbird/components/import.xpt @@ -118,7 +117,6 @@ -rwxr-xr-x root/root usr/lib/thunderbird/components/libgklayout.so -rwxr-xr-x root/root usr/lib/thunderbird/components/libhtmlpars.so -rwxr-xr-x root/root usr/lib/thunderbird/components/libi18n.so --rwxr-xr-x root/root usr/lib/thunderbird/components/libimgicon.so -rwxr-xr-x root/root usr/lib/thunderbird/components/libimglib2.so -rwxr-xr-x root/root usr/lib/thunderbird/components/libimport.so -rwxr-xr-x root/root usr/lib/thunderbird/components/libjar50.so Modified: crux-2.2/ports/opt/thunderbird/.md5sum =================================================================== --- crux-2.2/ports/opt/thunderbird/.md5sum 2006-08-29 16:27:08 UTC (rev 1788) +++ crux-2.2/ports/opt/thunderbird/.md5sum 2006-08-29 19:22:00 UTC (rev 1789) @@ -1,2 +1,2 @@ f346e07ab1a6ecb55cc7f08fda1306ce mozconfig -ada9c163f5b26fe81958e7a85340811e thunderbird-1.5.0.4-source.tar.bz2 +b09d29f912c2133a75b44f4801fc62b0 thunderbird-1.5.0.5-source.tar.bz2 Modified: crux-2.2/ports/opt/thunderbird/Pkgfile =================================================================== --- crux-2.2/ports/opt/thunderbird/Pkgfile 2006-08-29 16:27:08 UTC (rev 1788) +++ crux-2.2/ports/opt/thunderbird/Pkgfile 2006-08-29 19:22:00 UTC (rev 1789) @@ -4,7 +4,7 @@ # Depends on: libidl, gtk, libjpeg, libpng, zlib, expat name=thunderbird -version=1.5.0.4 +version=1.5.0.5 release=1 source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/sour… \ mozconfig)

1 0

r1788 - crux-2.2/ports/opt/openbox
by crux＠crux.nu 29 Aug '06

29 Aug '06

Author: tilman Date: 2006-08-29 18:27:08 +0200 (Tue, 29 Aug 2006) New Revision: 1788 Modified: crux-2.2/ports/opt/openbox/.footprint crux-2.2/ports/opt/openbox/Pkgfile Log: openbox: revert r1781 cause i'm stupid. thanks maro Modified: crux-2.2/ports/opt/openbox/.footprint =================================================================== --- crux-2.2/ports/opt/openbox/.footprint 2006-08-29 16:15:24 UTC (rev 1787) +++ crux-2.2/ports/opt/openbox/.footprint 2006-08-29 16:27:08 UTC (rev 1788) @@ -38,10 +38,9 @@ -rw-r--r-- root/root usr/lib/pkgconfig/obparser-3.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/obrender-3.0.pc drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/openbox.desktop drwxr-xr-x root/root usr/share/gnome/ drwxr-xr-x root/root usr/share/gnome/wm-properties/ +-rw-r--r-- root/root usr/share/gnome/wm-properties/openbox.desktop drwxr-xr-x root/root usr/share/openbox/ -rw-r--r-- root/root usr/share/openbox/menu.xsd -rw-r--r-- root/root usr/share/openbox/rc.xsd Modified: crux-2.2/ports/opt/openbox/Pkgfile =================================================================== --- crux-2.2/ports/opt/openbox/Pkgfile 2006-08-29 16:15:24 UTC (rev 1787) +++ crux-2.2/ports/opt/openbox/Pkgfile 2006-08-29 16:27:08 UTC (rev 1788) @@ -5,7 +5,7 @@ name=openbox version=3.3 -release=2 +release=3 source=(http://www.icculus.org/$name/releases/$name-$version.tar.gz) build() { @@ -15,8 +15,4 @@ make make DESTDIR=$PKG install - - install -d $PKG/usr/share/applications - mv $PKG/usr/share/gnome/wm-properties/openbox.desktop \ - $PKG/usr/share/applications }

1 0

r1787 - crux-2.2/ports/core/rdate
by crux＠crux.nu 29 Aug '06

29 Aug '06

Author: sip Date: 2006-08-29 18:15:24 +0200 (Tue, 29 Aug 2006) New Revision: 1787 Modified: crux-2.2/ports/core/rdate/Pkgfile Log: rdate: fixed url Modified: crux-2.2/ports/core/rdate/Pkgfile =================================================================== --- crux-2.2/ports/core/rdate/Pkgfile 2006-08-29 16:05:49 UTC (rev 1786) +++ crux-2.2/ports/core/rdate/Pkgfile 2006-08-29 16:15:24 UTC (rev 1787) @@ -5,7 +5,7 @@ name=rdate version=1.4 release=1 -source=(ftp://people.redhat.com/sopwith/$name-$version.tar.gz rdate) +source=(http://ftp.osuosl.org/pub/nslu2/sources/$name-$version.tar.gz rdate) build() { cd $name-$version

1 0

r1786 - crux-2.2/ports/opt/windowmaker
by crux＠crux.nu 29 Aug '06

29 Aug '06

Author: sip Date: 2006-08-29 18:05:49 +0200 (Tue, 29 Aug 2006) New Revision: 1786 Modified: crux-2.2/ports/opt/windowmaker/Pkgfile Log: windowmaker: fixed url Modified: crux-2.2/ports/opt/windowmaker/Pkgfile =================================================================== --- crux-2.2/ports/opt/windowmaker/Pkgfile 2006-08-28 14:45:35 UTC (rev 1785) +++ crux-2.2/ports/opt/windowmaker/Pkgfile 2006-08-29 16:05:49 UTC (rev 1786) @@ -6,7 +6,7 @@ name=windowmaker version=0.92.0 release=3 -source=(ftp://ftp.windowmaker.info/pub/source/release/WindowMaker-$version.tar.bz2 \ +source=(http://windowmaker.info/pub/source/release/WindowMaker-$version.tar.bz2 \ $name-$version-gcc4.patch) build() {

1 0