- crux-commits - lists.crux.nu

r1767 - tools/pkgutils/trunk
by crux＠crux.nu 24 Aug '06

24 Aug '06

Author: tilman Date: 2006-08-24 18:17:54 +0200 (Thu, 24 Aug 2006) New Revision: 1767 Modified: tools/pkgutils/trunk/ChangeLog tools/pkgutils/trunk/pkgadd.cc tools/pkgutils/trunk/pkgadd.h Log: prepared the code for the addition of the INSTALL rule Modified: tools/pkgutils/trunk/ChangeLog =================================================================== --- tools/pkgutils/trunk/ChangeLog 2006-08-23 20:29:01 UTC (rev 1766) +++ tools/pkgutils/trunk/ChangeLog 2006-08-24 16:17:54 UTC (rev 1767) @@ -1,6 +1,10 @@ +2006-08-24 Tilman Sauerbeck (tilman at crux nu) + * pkgadd.{h,cc}: Prepared the code for addition of the INSTALL rule + 2006-04-29 Simone Rota (sip at crux dot nu) * Optimized file type detection for stripping in pkgmk Thanks to Antti Nyk�nen + 2006-04-14 Tilman Sauerbeck (tilman at crux nu) * ChangeLog, NEWS: Moved old ChangeLog to NEWS * pkgmk.in: Write warnings and errors to stderr instead of stdout Modified: tools/pkgutils/trunk/pkgadd.cc =================================================================== --- tools/pkgutils/trunk/pkgadd.cc 2006-08-23 20:29:01 UTC (rev 1766) +++ tools/pkgutils/trunk/pkgadd.cc 2006-08-24 16:17:54 UTC (rev 1767) @@ -142,7 +142,7 @@ if (!strcmp(event, "UPGRADE")) { rule_t rule; - rule.event = rule_t::UPGRADE; + rule.event = UPGRADE; rule.pattern = pattern; if (!strcmp(action, "YES")) { rule.action = true; @@ -175,21 +175,17 @@ set<string> pkgadd::make_keep_list(const set<string>& files, const vector<rule_t>& rules) const { set<string> keep_list; + vector<rule_t> found; + find_rules(rules, UPGRADE, found); + for (set<string>::const_iterator i = files.begin(); i != files.end(); i++) { - for (vector<rule_t>::const_reverse_iterator j = rules.rbegin(); j != rules.rend(); j++) { - if ((*j).event == rule_t::UPGRADE) { - regex_t preg; - if (regcomp(&preg, (*j).pattern.c_str(), REG_EXTENDED | REG_NOSUB)) - throw runtime_error("error compiling regular expression '" + (*j).pattern + "', aborting"); + for (vector<rule_t>::reverse_iterator j = found.rbegin(); j != found.rend(); j++) { + if (rule_applies_to_file(*j, *i)) { + if (!(*j).action) + keep_list.insert(keep_list.end(), *i); - if (!regexec(&preg, (*i).c_str(), 0, 0, 0)) { - if (!(*j).action) - keep_list.insert(keep_list.end(), *i); - regfree(&preg); - break; - } - regfree(&preg); + break; } } } @@ -204,3 +200,24 @@ return keep_list; } + +void pkgadd::find_rules(const vector<rule_t>& rules, rule_event_t event, vector<rule_t>& found) const +{ + for (vector<rule_t>::const_iterator i = rules.begin(); i != rules.end(); i++) + if (i->event == event) + found.push_back(*i); +} + +bool pkgadd::rule_applies_to_file(const rule_t& rule, const string& file) const +{ + regex_t preg; + bool ret; + + if (regcomp(&preg, rule.pattern.c_str(), REG_EXTENDED | REG_NOSUB)) + throw runtime_error("error compiling regular expression '" + rule.pattern + "', aborting"); + + ret = !regexec(&preg, file.c_str(), 0, 0, 0); + regfree(&preg); + + return ret; +} Modified: tools/pkgutils/trunk/pkgadd.h =================================================================== --- tools/pkgutils/trunk/pkgadd.h 2006-08-23 20:29:01 UTC (rev 1766) +++ tools/pkgutils/trunk/pkgadd.h 2006-08-24 16:17:54 UTC (rev 1767) @@ -29,8 +29,12 @@ #define PKGADD_CONF "/etc/pkgadd.conf" #define PKGADD_CONF_MAXLINE 1024 +enum rule_event_t { + UPGRADE +}; + struct rule_t { - enum { UPGRADE } event; + rule_event_t event; string pattern; bool action; }; @@ -44,6 +48,8 @@ private: vector<rule_t> read_config() const; set<string> make_keep_list(const set<string>& files, const vector<rule_t>& rules) const; + void find_rules(const vector<rule_t>& rules, rule_event_t event, vector<rule_t>& found) const; + bool rule_applies_to_file(const rule_t& rule, const string& file) const; }; #endif /* PKGADD_H */

1 0

r1766 - crux-2.2/ports/opt/rar
by crux＠crux.nu 23 Aug '06

23 Aug '06

Author: sip Date: 2006-08-23 22:29:01 +0200 (Wed, 23 Aug 2006) New Revision: 1766 Modified: crux-2.2/ports/opt/rar/.md5sum crux-2.2/ports/opt/rar/Pkgfile Log: rar: updated to 2.6.0 Modified: crux-2.2/ports/opt/rar/.md5sum =================================================================== --- crux-2.2/ports/opt/rar/.md5sum 2006-08-23 19:48:06 UTC (rev 1765) +++ crux-2.2/ports/opt/rar/.md5sum 2006-08-23 20:29:01 UTC (rev 1766) @@ -1 +1 @@ -743ae1cb750c11fa55d7204a9d7f256f rarlinux-3.4.1.tar.gz +50c530f0896cff4f922bb480ccb1aa18 rarlinux-3.6.0.tar.gz Modified: crux-2.2/ports/opt/rar/Pkgfile =================================================================== --- crux-2.2/ports/opt/rar/Pkgfile 2006-08-23 19:48:06 UTC (rev 1765) +++ crux-2.2/ports/opt/rar/Pkgfile 2006-08-23 20:29:01 UTC (rev 1766) @@ -4,7 +4,7 @@ # Packager: name=rar -version=3.4.1 +version=3.6.0 release=1 source=(http://www.rarlab.com/rar/rarlinux-$version.tar.gz)

1 0

r1765 - in crux-2.2/ports/opt: . udev-netif-hotplug-handler
by crux＠crux.nu 23 Aug '06

23 Aug '06

Author: jw Date: 2006-08-23 21:48:06 +0200 (Wed, 23 Aug 2006) New Revision: 1765 Added: crux-2.2/ports/opt/udev-netif-hotplug-handler/ crux-2.2/ports/opt/udev-netif-hotplug-handler/.footprint crux-2.2/ports/opt/udev-netif-hotplug-handler/.md5sum crux-2.2/ports/opt/udev-netif-hotplug-handler/26-crux-netif.rules crux-2.2/ports/opt/udev-netif-hotplug-handler/Pkgfile crux-2.2/ports/opt/udev-netif-hotplug-handler/README crux-2.2/ports/opt/udev-netif-hotplug-handler/netif_handler Log: udev-netif-hotplug-handler: initial commit Added: crux-2.2/ports/opt/udev-netif-hotplug-handler/.footprint =================================================================== --- crux-2.2/ports/opt/udev-netif-hotplug-handler/.footprint (rev 0) +++ crux-2.2/ports/opt/udev-netif-hotplug-handler/.footprint 2006-08-23 19:48:06 UTC (rev 1765) @@ -0,0 +1,7 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/udev/ +drwxr-xr-x root/root etc/udev/rules.d/ +-rw-r--r-- root/root etc/udev/rules.d/26-crux-netif.rules +drwxr-xr-x root/root lib/ +drwxr-xr-x root/root lib/udev/ +-rwxr-xr-x root/root lib/udev/netif_handler Added: crux-2.2/ports/opt/udev-netif-hotplug-handler/.md5sum =================================================================== --- crux-2.2/ports/opt/udev-netif-hotplug-handler/.md5sum (rev 0) +++ crux-2.2/ports/opt/udev-netif-hotplug-handler/.md5sum 2006-08-23 19:48:06 UTC (rev 1765) @@ -0,0 +1,2 @@ +7bf9a4d9a27373c7402735fbd3ff1f1f 26-crux-netif.rules +7e3eef4cd843bf9c4b53b0e2d83abedc netif_handler Added: crux-2.2/ports/opt/udev-netif-hotplug-handler/26-crux-netif.rules =================================================================== --- crux-2.2/ports/opt/udev-netif-hotplug-handler/26-crux-netif.rules (rev 0) +++ crux-2.2/ports/opt/udev-netif-hotplug-handler/26-crux-netif.rules 2006-08-23 19:48:06 UTC (rev 1765) @@ -0,0 +1,3 @@ +# Network hotplugging +ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="/lib/udev/netif_handler" +ACTION=="remove", SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="/lib/udev/netif_handler" Added: crux-2.2/ports/opt/udev-netif-hotplug-handler/Pkgfile =================================================================== --- crux-2.2/ports/opt/udev-netif-hotplug-handler/Pkgfile (rev 0) +++ crux-2.2/ports/opt/udev-netif-hotplug-handler/Pkgfile 2006-08-23 19:48:06 UTC (rev 1765) @@ -0,0 +1,15 @@ +# Maintainer: Johannes Winkelmann, jw at smts dot ch +# Description: udev network interface hotplug handler +# URL: http://crux.nu/ +# Depends on: udev + +name=udev-netif-hotplug-handler +version=1.2 +release=1 +source=(netif_handler 26-crux-netif.rules) + +build() { + install -m 755 -D netif_handler $PKG/lib/udev/netif_handler + install -m 644 -D 26-crux-netif.rules \ + $PKG/etc/udev/rules.d/26-crux-netif.rules +} Added: crux-2.2/ports/opt/udev-netif-hotplug-handler/README =================================================================== --- crux-2.2/ports/opt/udev-netif-hotplug-handler/README (rev 0) +++ crux-2.2/ports/opt/udev-netif-hotplug-handler/README 2006-08-23 19:48:06 UTC (rev 1765) @@ -0,0 +1,6 @@ +This port implements a hotplug handler for network devices, allowing to react +on hotplug events i.e. to assign an IP. + +Once active, a handler script will call + /etc/rc.d/net.<ifname> [start|stop] +where 'ifname' is the name of the interface, i.e. eth0, ath0, usb0 etc. Added: crux-2.2/ports/opt/udev-netif-hotplug-handler/netif_handler =================================================================== --- crux-2.2/ports/opt/udev-netif-hotplug-handler/netif_handler (rev 0) +++ crux-2.2/ports/opt/udev-netif-hotplug-handler/netif_handler 2006-08-23 19:48:06 UTC (rev 1765) @@ -0,0 +1,47 @@ +#!/bin/bash +# udev network interface starter +# adapted from +# http://linuxfromscratch.org/pipermail/cross-lfs/2006-January/001042.html +# +# Johannes Winkelmann, jw at smts dot ch + +version=1.2 +DEBUG=no + +log() { + logger $* +} +debug() { + if [ x"$DEBUG" = "xyes" ]; then + log $* + fi +} + + +# validate $INTERFACE +case "$INTERFACE" in + "") + debug_log "$call: empty device; exiting" + exit 1 + ;; + ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*) + debug_log "assuming $INTERFACE is already up" + exit 0 + ;; +esac + +# valid interface, try calling the appropriate handler +call=`basename $0` +if [ ! -f /etc/rc.d/net.$INTERFACE ]; then + debug_log "$call: not found: /etc/rc.d/net.$INTERFACE" + exit 0 +fi + +if [ "$ACTION" = "add" ]; then + command=start +else + command=stop +fi + +/etc/rc.d/net.$INTERFACE $command +log "$call $INTERFACE $command"

1 0

r1764 - crux-2.2/ports/core/udev
by crux＠crux.nu 23 Aug '06

23 Aug '06

Author: jw Date: 2006-08-23 21:35:00 +0200 (Wed, 23 Aug 2006) New Revision: 1764 Modified: crux-2.2/ports/core/udev/Pkgfile Log: udev: cosmetic: replace cat with cp Modified: crux-2.2/ports/core/udev/Pkgfile =================================================================== --- crux-2.2/ports/core/udev/Pkgfile 2006-08-23 19:31:02 UTC (rev 1763) +++ crux-2.2/ports/core/udev/Pkgfile 2006-08-23 19:35:00 UTC (rev 1764) @@ -36,5 +36,5 @@ install -m 0755 $SRC/cdsymlinks $PKG/lib/udev/ install -m 0755 $SRC/dvb_helper $PKG/lib/udev/ cat $SRC/cdrom.rules >> $PKG/etc/udev/rules.d/81-cdrom.rules - cat $SRC/crux.rules >> $PKG/etc/udev/rules.d/26-crux.rules + cp $SRC/crux.rules $PKG/etc/udev/rules.d/26-crux.rules }

1 0

r1763 - crux-2.2/ports/core/udev
by crux＠crux.nu 23 Aug '06

23 Aug '06

Author: jw Date: 2006-08-23 21:31:02 +0200 (Wed, 23 Aug 2006) New Revision: 1763 Added: crux-2.2/ports/core/udev/crux.rules crux-2.2/ports/core/udev/dvb_helper Modified: crux-2.2/ports/core/udev/.footprint crux-2.2/ports/core/udev/.md5sum crux-2.2/ports/core/udev/Pkgfile Log: udev: add dvb handling Modified: crux-2.2/ports/core/udev/.footprint =================================================================== --- crux-2.2/ports/core/udev/.footprint 2006-08-23 09:41:47 UTC (rev 1762) +++ crux-2.2/ports/core/udev/.footprint 2006-08-23 19:31:02 UTC (rev 1763) @@ -5,6 +5,7 @@ drwxr-xr-x root/root etc/udev/rules.d/ -rw-r--r-- root/root etc/udev/rules.d/05-udev-early.rules -rw-r--r-- root/root etc/udev/rules.d/25-lfs.rules +-rw-r--r-- root/root etc/udev/rules.d/26-crux.rules -rw-r--r-- root/root etc/udev/rules.d/26-modprobe.rules -rw-r--r-- root/root etc/udev/rules.d/27-firmware.rules -rw-r--r-- root/root etc/udev/rules.d/60-persistent-storage.rules @@ -30,6 +31,7 @@ lrwxrwxrwx root/root lib/udev/devices/stdin -> /proc/self/fd/0 lrwxrwxrwx root/root lib/udev/devices/stdout -> /proc/self/fd/1 crw-rw-rw- root/root lib/udev/devices/zero (1, 5) +-rwxr-xr-x root/root lib/udev/dvb_helper -rwxr-xr-x root/root lib/udev/edd_id -rwxr-xr-x root/root lib/udev/firmware.sh -rwxr-xr-x root/root lib/udev/path_id Modified: crux-2.2/ports/core/udev/.md5sum =================================================================== --- crux-2.2/ports/core/udev/.md5sum 2006-08-23 09:41:47 UTC (rev 1762) +++ crux-2.2/ports/core/udev/.md5sum 2006-08-23 19:31:02 UTC (rev 1763) @@ -1,5 +1,7 @@ c0da74341672681c9bd924439ea4e84d cdrom.rules 6c4a8bd7aef573838305e212ffb9bc6a cdsymlinks +ef01d7356869dc070029b8de9b6d4f7d crux.rules +7818c207e95af667657782ba9884a404 dvb_helper 40ab559668ab739473fa9f4a45ba28da start_udev f4effef7807ce1dc91ab581686ef197b udev-096.tar.bz2 6ef52d52f45ca91daea3cfa840d1083b udev-config-20060715.tar.bz2 Modified: crux-2.2/ports/core/udev/Pkgfile =================================================================== --- crux-2.2/ports/core/udev/Pkgfile 2006-08-23 09:41:47 UTC (rev 1762) +++ crux-2.2/ports/core/udev/Pkgfile 2006-08-23 19:31:02 UTC (rev 1763) @@ -4,10 +4,10 @@ name=udev version=096 -release=2 +release=3 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.… http://crux.nu/files/udev-config-20060715.tar.bz2 - start_udev cdrom.rules cdsymlinks) + start_udev cdrom.rules cdsymlinks crux.rules dvb_helper) build() { cd udev-$version @@ -34,5 +34,7 @@ cp $SRC/udev-config-20060715/*.rules $PKG/etc/udev/rules.d/ install -m 0755 $SRC/start_udev $PKG/sbin install -m 0755 $SRC/cdsymlinks $PKG/lib/udev/ + install -m 0755 $SRC/dvb_helper $PKG/lib/udev/ cat $SRC/cdrom.rules >> $PKG/etc/udev/rules.d/81-cdrom.rules + cat $SRC/crux.rules >> $PKG/etc/udev/rules.d/26-crux.rules } Added: crux-2.2/ports/core/udev/crux.rules =================================================================== --- crux-2.2/ports/core/udev/crux.rules (rev 0) +++ crux-2.2/ports/core/udev/crux.rules 2006-08-23 19:31:02 UTC (rev 1763) @@ -0,0 +1,4 @@ +# CRUX udev rules + +# DVB handling +KERNEL=="dvb*", PROGRAM="/lib/udev/dvb_helper %k", NAME="%c" Added: crux-2.2/ports/core/udev/dvb_helper =================================================================== --- crux-2.2/ports/core/udev/dvb_helper (rev 0) +++ crux-2.2/ports/core/udev/dvb_helper 2006-08-23 19:31:02 UTC (rev 1763) @@ -0,0 +1,5 @@ +#!/bin/sh +# Helper script to name dvb devices; taken from Documentation/dvb/udev.txt + +/bin/echo $1 | \ + /bin/sed -e 's,dvb$[0-9]$\.$[^0-9]*$$[0-9]$,dvb/adapter\1/\2\3,' Property changes on: crux-2.2/ports/core/udev/dvb_helper ___________________________________________________________________ Name: svn:executable + *

1 0

r1762 - crux-2.2/ports/opt/libtiff
by crux＠crux.nu 23 Aug '06

23 Aug '06

Author: jue Date: 2006-08-23 11:41:47 +0200 (Wed, 23 Aug 2006) New Revision: 1762 Added: crux-2.2/ports/opt/libtiff/libtiff-3.8.2.patch Modified: crux-2.2/ports/opt/libtiff/.md5sum crux-2.2/ports/opt/libtiff/Pkgfile Log: [security] libtiff: fix for CVE-2006-34{59-65}, see http://securitytracker.com/alerts/2006/Aug/1016628.html Modified: crux-2.2/ports/opt/libtiff/.md5sum =================================================================== --- crux-2.2/ports/opt/libtiff/.md5sum 2006-08-23 09:37:35 UTC (rev 1761) +++ crux-2.2/ports/opt/libtiff/.md5sum 2006-08-23 09:41:47 UTC (rev 1762) @@ -1 +1,2 @@ +a4ea70dcc10840fbb630270862970e61 libtiff-3.8.2.patch fbb6f446ea4ed18955e2714934e5b698 tiff-3.8.2.tar.gz Modified: crux-2.2/ports/opt/libtiff/Pkgfile =================================================================== --- crux-2.2/ports/opt/libtiff/Pkgfile 2006-08-23 09:37:35 UTC (rev 1761) +++ crux-2.2/ports/opt/libtiff/Pkgfile 2006-08-23 09:41:47 UTC (rev 1762) @@ -5,11 +5,13 @@ name=libtiff version=3.8.2 -release=1 -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-$version.tar.gz) +release=2 +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-$version.tar.gz \ + $name-$version.patch) build() { cd tiff-$version + patch -p1 < $SRC/$name-$version.patch ./configure --prefix=/usr make make DESTDIR=$PKG install Added: crux-2.2/ports/opt/libtiff/libtiff-3.8.2.patch =================================================================== --- crux-2.2/ports/opt/libtiff/libtiff-3.8.2.patch (rev 0) +++ crux-2.2/ports/opt/libtiff/libtiff-3.8.2.patch 2006-08-23 09:41:47 UTC (rev 1762) @@ -0,0 +1,674 @@ +# Security fix for multiple issues (CVE-2006-34{59-65}) +# +# http://securitytracker.com/alerts/2006/Aug/1016628.html +# http://bugs.gentoo.org/show_bug.cgi?id=142383 + +diff -ru tiff-3.8.2/libtiff/tif_dir.c tiff-3.8.2-goo/libtiff/tif_dir.c +--- tiff-3.8.2/libtiff/tif_dir.c 2006-03-21 16:42:50.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_dir.c 2006-07-14 13:52:01.027562000 +0100 +@@ -122,6 +122,7 @@ + { + static const char module[] = "_TIFFVSetField"; + ++ const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY); + TIFFDirectory* td = &tif->tif_dir; + int status = 1; + uint32 v32, i, v; +@@ -195,10 +196,12 @@ + break; + case TIFFTAG_ORIENTATION: + v = va_arg(ap, uint32); ++ const TIFFFieldInfo* fip; + if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) { ++ fip = _TIFFFieldWithTag(tif, tag); + TIFFWarningExt(tif->tif_clientdata, tif->tif_name, + "Bad value %lu for \"%s\" tag ignored", +- v, _TIFFFieldWithTag(tif, tag)->field_name); ++ v, fip ? fip->field_name : "Unknown"); + } else + td->td_orientation = (uint16) v; + break; +@@ -387,11 +390,15 @@ + * happens, for example, when tiffcp is used to convert between + * compression schemes and codec-specific tags are blindly copied. + */ ++ /* ++ * better not dereference fip if it is NULL. ++ * -- taviso(a)google.com 15 Jun 2006 ++ */ + if(fip == NULL || fip->field_bit != FIELD_CUSTOM) { + TIFFErrorExt(tif->tif_clientdata, module, + "%s: Invalid %stag \"%s\" (not supported by codec)", + tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "", +- _TIFFFieldWithTag(tif, tag)->field_name); ++ fip ? fip->field_name : "Unknown"); + status = 0; + break; + } +@@ -468,7 +475,7 @@ + if (fip->field_type == TIFF_ASCII) + _TIFFsetString((char **)&tv->value, va_arg(ap, char *)); + else { +- tv->value = _TIFFmalloc(tv_size * tv->count); ++ tv->value = _TIFFCheckMalloc(tif, tv_size, tv->count, "Tag Value"); + if (!tv->value) { + status = 0; + goto end; +@@ -563,7 +570,7 @@ + } + } + if (status) { +- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit); ++ TIFFSetFieldBit(tif, fip->field_bit); + tif->tif_flags |= TIFF_DIRTYDIRECT; + } + +@@ -572,12 +579,12 @@ + return (status); + badvalue: + TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %d for \"%s\"", +- tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name); ++ tif->tif_name, v, fip ? fip->field_name : "Unknown"); + va_end(ap); + return (0); + badvalue32: + TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %ld for \"%s\"", +- tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name); ++ tif->tif_name, v32, fip ? fip->field_name : "Unknown"); + va_end(ap); + return (0); + } +@@ -813,12 +820,16 @@ + * If the client tries to get a tag that is not valid + * for the image's codec then we'll arrive here. + */ ++ /* ++ * dont dereference fip if it's NULL. ++ * -- taviso(a)google.com 15 Jun 2006 ++ */ + if( fip == NULL || fip->field_bit != FIELD_CUSTOM ) + { + TIFFErrorExt(tif->tif_clientdata, "_TIFFVGetField", + "%s: Invalid %stag \"%s\" (not supported by codec)", + tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "", +- _TIFFFieldWithTag(tif, tag)->field_name); ++ fip ? fip->field_name : "Unknown"); + ret_val = 0; + break; + } +diff -ru tiff-3.8.2/libtiff/tif_dirinfo.c tiff-3.8.2-goo/libtiff/tif_dirinfo.c +--- tiff-3.8.2/libtiff/tif_dirinfo.c 2006-02-07 13:51:03.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_dirinfo.c 2006-07-14 13:52:00.953558000 +0100 +@@ -775,7 +775,8 @@ + TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithTag", + "Internal error, unknown tag 0x%x", + (unsigned int) tag); +- assert(fip != NULL); ++ /* assert(fip != NULL); */ ++ + /*NOTREACHED*/ + } + return (fip); +@@ -789,7 +790,8 @@ + if (!fip) { + TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithName", + "Internal error, unknown tag %s", field_name); +- assert(fip != NULL); ++ /* assert(fip != NULL); */ ++ + /*NOTREACHED*/ + } + return (fip); +diff -ru tiff-3.8.2/libtiff/tif_dirread.c tiff-3.8.2-goo/libtiff/tif_dirread.c +--- tiff-3.8.2/libtiff/tif_dirread.c 2006-03-21 16:42:50.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_dirread.c 2006-07-14 13:52:00.842557000 +0100 +@@ -29,6 +29,9 @@ + * + * Directory Read Support Routines. + */ ++ ++#include <limits.h> ++ + #include "tiffiop.h" + + #define IGNORE 0 /* tag placeholder used below */ +@@ -81,6 +84,7 @@ + uint16 dircount; + toff_t nextdiroff; + int diroutoforderwarning = 0; ++ int compressionknown = 0; + toff_t* new_dirlist; + + tif->tif_diroff = tif->tif_nextdiroff; +@@ -147,13 +151,20 @@ + } else { + toff_t off = tif->tif_diroff; + +- if (off + sizeof (uint16) > tif->tif_size) { +- TIFFErrorExt(tif->tif_clientdata, module, +- "%s: Can not read TIFF directory count", +- tif->tif_name); +- return (0); ++ /* ++ * Check for integer overflow when validating the dir_off, otherwise ++ * a very high offset may cause an OOB read and crash the client. ++ * -- taviso(a)google.com, 14 Jun 2006. ++ */ ++ if (off + sizeof (uint16) > tif->tif_size || ++ off > (UINT_MAX - sizeof(uint16))) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "%s: Can not read TIFF directory count", ++ tif->tif_name); ++ return (0); + } else +- _TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16)); ++ _TIFFmemcpy(&dircount, tif->tif_base + off, ++ sizeof (uint16)); + off += sizeof (uint16); + if (tif->tif_flags & TIFF_SWAB) + TIFFSwabShort(&dircount); +@@ -254,6 +265,7 @@ + while (fix < tif->tif_nfields && + tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag) + fix++; ++ + if (fix >= tif->tif_nfields || + tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) { + +@@ -264,17 +276,23 @@ + dp->tdir_tag, + dp->tdir_tag, + dp->tdir_type); +- +- TIFFMergeFieldInfo(tif, +- _TIFFCreateAnonFieldInfo(tif, +- dp->tdir_tag, +- (TIFFDataType) dp->tdir_type), +- 1 ); ++ /* ++ * creating anonymous fields prior to knowing the compression ++ * algorithm (ie, when the field info has been merged) could cause ++ * crashes with pathological directories. ++ * -- taviso(a)google.com 15 Jun 2006 ++ */ ++ if (compressionknown) ++ TIFFMergeFieldInfo(tif, _TIFFCreateAnonFieldInfo(tif, dp->tdir_tag, ++ (TIFFDataType) dp->tdir_type), 1 ); ++ else goto ignore; ++ + fix = 0; + while (fix < tif->tif_nfields && + tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag) + fix++; + } ++ + /* + * Null out old tags that we ignore. + */ +@@ -326,6 +344,7 @@ + dp->tdir_type, dp->tdir_offset); + if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v)) + goto bad; ++ else compressionknown++; + break; + /* XXX: workaround for broken TIFFs */ + } else if (dp->tdir_type == TIFF_LONG) { +@@ -540,6 +559,7 @@ + * Attempt to deal with a missing StripByteCounts tag. + */ + if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) { ++ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS); + /* + * Some manufacturers violate the spec by not giving + * the size of the strips. In this case, assume there +@@ -556,7 +576,7 @@ + "%s: TIFF directory is missing required " + "\"%s\" field, calculating from imagelength", + tif->tif_name, +- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name); ++ fip ? fip->field_name : "Unknown"); + if (EstimateStripByteCounts(tif, dir, dircount) < 0) + goto bad; + /* +@@ -580,6 +600,7 @@ + } else if (td->td_nstrips == 1 + && td->td_stripoffset[0] != 0 + && BYTECOUNTLOOKSBAD) { ++ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS); + /* + * XXX: Plexus (and others) sometimes give a value of zero for + * a tag when they don't know what the correct value is! Try +@@ -589,13 +610,14 @@ + TIFFWarningExt(tif->tif_clientdata, module, + "%s: Bogus \"%s\" field, ignoring and calculating from imagelength", + tif->tif_name, +- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name); ++ fip ? fip->field_name : "Unknown"); + if(EstimateStripByteCounts(tif, dir, dircount) < 0) + goto bad; + } else if (td->td_planarconfig == PLANARCONFIG_CONTIG + && td->td_nstrips > 2 + && td->td_compression == COMPRESSION_NONE + && td->td_stripbytecount[0] != td->td_stripbytecount[1]) { ++ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS); + /* + * XXX: Some vendors fill StripByteCount array with absolutely + * wrong values (it can be equal to StripOffset array, for +@@ -604,7 +626,7 @@ + TIFFWarningExt(tif->tif_clientdata, module, + "%s: Wrong \"%s\" field, ignoring and calculating from imagelength", + tif->tif_name, +- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name); ++ fip ? fip->field_name : "Unknown"); + if (EstimateStripByteCounts(tif, dir, dircount) < 0) + goto bad; + } +@@ -870,7 +892,13 @@ + + register TIFFDirEntry *dp; + register TIFFDirectory *td = &tif->tif_dir; +- uint16 i; ++ ++ /* i is used to iterate over td->td_nstrips, so must be ++ * at least the same width. ++ * -- taviso(a)google.com 15 Jun 2006 ++ */ ++ ++ uint32 i; + + if (td->td_stripbytecount) + _TIFFfree(td->td_stripbytecount); +@@ -947,16 +975,18 @@ + static int + CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count) + { ++ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); ++ + if (count > dir->tdir_count) { + TIFFWarningExt(tif->tif_clientdata, tif->tif_name, + "incorrect count for field \"%s\" (%lu, expecting %lu); tag ignored", +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, ++ fip ? fip->field_name : "Unknown", + dir->tdir_count, count); + return (0); + } else if (count < dir->tdir_count) { + TIFFWarningExt(tif->tif_clientdata, tif->tif_name, + "incorrect count for field \"%s\" (%lu, expecting %lu); tag trimmed", +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, ++ fip ? fip->field_name : "Unknown", + dir->tdir_count, count); + return (1); + } +@@ -970,6 +1000,7 @@ + TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp) + { + int w = TIFFDataWidth((TIFFDataType) dir->tdir_type); ++ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); + tsize_t cc = dir->tdir_count * w; + + /* Check for overflow. */ +@@ -1013,7 +1044,7 @@ + bad: + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "Error fetching data for field \"%s\"", +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); ++ fip ? fip->field_name : "Unknown"); + return (tsize_t) 0; + } + +@@ -1039,10 +1070,12 @@ + static int + cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv) + { ++ const TIFFFieldInfo* fip; + if (denom == 0) { ++ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s: Rational with zero denominator (num = %lu)", +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num); ++ fip ? fip->field_name : "Unknown", num); + return (0); + } else { + if (dir->tdir_type == TIFF_RATIONAL) +@@ -1159,6 +1192,20 @@ + static int + TIFFFetchShortPair(TIFF* tif, TIFFDirEntry* dir) + { ++ /* ++ * Prevent overflowing the v stack arrays below by performing a sanity ++ * check on tdir_count, this should never be greater than two. ++ * -- taviso(a)google.com 14 Jun 2006. ++ */ ++ if (dir->tdir_count > 2) { ++ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); ++ TIFFWarningExt(tif->tif_clientdata, tif->tif_name, ++ "unexpected count for field \"%s\", %lu, expected 2; ignored.", ++ fip ? fip->field_name : "Unknown", ++ dir->tdir_count); ++ return 0; ++ } ++ + switch (dir->tdir_type) { + case TIFF_BYTE: + case TIFF_SBYTE: +@@ -1329,14 +1376,15 @@ + case TIFF_DOUBLE: + return (TIFFFetchDoubleArray(tif, dir, (double*) v)); + default: ++ { const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag); + /* TIFF_NOTYPE */ + /* TIFF_ASCII */ + /* TIFF_UNDEFINED */ + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "cannot read TIFF_ANY type %d for field \"%s\"", + dir->tdir_type, +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); +- return (0); ++ fip ? fip->field_name : "Unknown"); ++ return (0); } + } + return (1); + } +@@ -1351,6 +1399,9 @@ + int ok = 0; + const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag); + ++ if (fip == NULL) { ++ return (0); ++ } + if (dp->tdir_count > 1) { /* array of values */ + char* cp = NULL; + +@@ -1493,6 +1544,7 @@ + TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl) + { + uint16 samples = tif->tif_dir.td_samplesperpixel; ++ const TIFFFieldInfo* fip; + int status = 0; + + if (CheckDirCount(tif, dir, (uint32) samples)) { +@@ -1510,9 +1562,10 @@ + + for (i = 1; i < check_count; i++) + if (v[i] != v[0]) { ++ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "Cannot handle different per-sample values for field \"%s\"", +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); ++ fip ? fip->field_name : "Unknown"); + goto bad; + } + *pl = v[0]; +@@ -1534,6 +1587,7 @@ + TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl) + { + uint16 samples = tif->tif_dir.td_samplesperpixel; ++ const TIFFFieldInfo* fip; + int status = 0; + + if (CheckDirCount(tif, dir, (uint32) samples)) { +@@ -1551,9 +1605,10 @@ + check_count = samples; + for (i = 1; i < check_count; i++) + if (v[i] != v[0]) { ++ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "Cannot handle different per-sample values for field \"%s\"", +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); ++ fip ? fip->field_name : "Unknown"); + goto bad; + } + *pl = v[0]; +@@ -1574,6 +1629,7 @@ + TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl) + { + uint16 samples = tif->tif_dir.td_samplesperpixel; ++ const TIFFFieldInfo* fip; + int status = 0; + + if (CheckDirCount(tif, dir, (uint32) samples)) { +@@ -1591,9 +1647,10 @@ + + for (i = 1; i < check_count; i++) + if (v[i] != v[0]) { ++ fip = _TIFFFieldWithTag(tif, dir->tdir_tag); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "Cannot handle different per-sample values for field \"%s\"", +- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name); ++ fip ? fip->field_name : "Unknown"); + goto bad; + } + *pl = v[0]; +diff -ru tiff-3.8.2/libtiff/tif_fax3.c tiff-3.8.2-goo/libtiff/tif_fax3.c +--- tiff-3.8.2/libtiff/tif_fax3.c 2006-03-21 16:42:50.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_fax3.c 2006-07-14 13:52:00.669557000 +0100 +@@ -1136,6 +1136,7 @@ + Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap) + { + Fax3BaseState* sp = Fax3State(tif); ++ const TIFFFieldInfo* fip; + + assert(sp != 0); + assert(sp->vsetparent != 0); +@@ -1181,7 +1182,13 @@ + default: + return (*sp->vsetparent)(tif, tag, ap); + } +- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit); ++ ++ if ((fip = _TIFFFieldWithTag(tif, tag))) { ++ TIFFSetFieldBit(tif, fip->field_bit); ++ } else { ++ return (0); ++ } ++ + tif->tif_flags |= TIFF_DIRTYDIRECT; + return (1); + } +diff -ru tiff-3.8.2/libtiff/tif_jpeg.c tiff-3.8.2-goo/libtiff/tif_jpeg.c +--- tiff-3.8.2/libtiff/tif_jpeg.c 2006-03-21 16:42:50.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_jpeg.c 2006-07-14 13:52:00.655560000 +0100 +@@ -722,15 +722,31 @@ + segment_width = TIFFhowmany(segment_width, sp->h_sampling); + segment_height = TIFFhowmany(segment_height, sp->v_sampling); + } +- if (sp->cinfo.d.image_width != segment_width || +- sp->cinfo.d.image_height != segment_height) { ++ if (sp->cinfo.d.image_width < segment_width || ++ sp->cinfo.d.image_height < segment_height) { + TIFFWarningExt(tif->tif_clientdata, module, + "Improper JPEG strip/tile size, expected %dx%d, got %dx%d", + segment_width, + segment_height, + sp->cinfo.d.image_width, + sp->cinfo.d.image_height); ++ } ++ ++ if (sp->cinfo.d.image_width > segment_width || ++ sp->cinfo.d.image_height > segment_height) { ++ /* ++ * This case could be dangerous, if the strip or tile size has been ++ * reported as less than the amount of data jpeg will return, some ++ * potential security issues arise. Catch this case and error out. ++ * -- taviso(a)google.com 14 Jun 2006 ++ */ ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "JPEG strip/tile size exceeds expected dimensions," ++ "expected %dx%d, got %dx%d", segment_width, segment_height, ++ sp->cinfo.d.image_width, sp->cinfo.d.image_height); ++ return (0); + } ++ + if (sp->cinfo.d.num_components != + (td->td_planarconfig == PLANARCONFIG_CONTIG ? + td->td_samplesperpixel : 1)) { +@@ -761,6 +777,22 @@ + sp->cinfo.d.comp_info[0].v_samp_factor, + sp->h_sampling, sp->v_sampling); + ++ /* ++ * There are potential security issues here for decoders that ++ * have already allocated buffers based on the expected sampling ++ * factors. Lets check the sampling factors dont exceed what ++ * we were expecting. ++ * -- taviso(a)google.com 14 June 2006 ++ */ ++ if (sp->cinfo.d.comp_info[0].h_samp_factor > sp->h_sampling || ++ sp->cinfo.d.comp_info[0].v_samp_factor > sp->v_sampling) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Cannot honour JPEG sampling factors that" ++ " exceed those specified."); ++ return (0); ++ } ++ ++ + /* + * XXX: Files written by the Intergraph software + * has different sampling factors stored in the +@@ -1521,15 +1553,18 @@ + { + JPEGState *sp = JState(tif); + +- assert(sp != 0); ++ /* assert(sp != 0); */ + + tif->tif_tagmethods.vgetfield = sp->vgetparent; + tif->tif_tagmethods.vsetfield = sp->vsetparent; + +- if( sp->cinfo_initialized ) +- TIFFjpeg_destroy(sp); /* release libjpeg resources */ +- if (sp->jpegtables) /* tag value */ +- _TIFFfree(sp->jpegtables); ++ if (sp != NULL) { ++ if( sp->cinfo_initialized ) ++ TIFFjpeg_destroy(sp); /* release libjpeg resources */ ++ if (sp->jpegtables) /* tag value */ ++ _TIFFfree(sp->jpegtables); ++ } ++ + _TIFFfree(tif->tif_data); /* release local state */ + tif->tif_data = NULL; + +@@ -1541,6 +1576,7 @@ + { + JPEGState* sp = JState(tif); + TIFFDirectory* td = &tif->tif_dir; ++ const TIFFFieldInfo* fip; + uint32 v32; + + assert(sp != NULL); +@@ -1606,7 +1642,13 @@ + default: + return (*sp->vsetparent)(tif, tag, ap); + } +- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit); ++ ++ if ((fip = _TIFFFieldWithTag(tif, tag))) { ++ TIFFSetFieldBit(tif, fip->field_bit); ++ } else { ++ return (0); ++ } ++ + tif->tif_flags |= TIFF_DIRTYDIRECT; + return (1); + } +@@ -1726,7 +1768,11 @@ + { + JPEGState* sp = JState(tif); + +- assert(sp != NULL); ++ /* assert(sp != NULL); */ ++ if (sp == NULL) { ++ TIFFWarningExt(tif->tif_clientdata, "JPEGPrintDir", "Unknown JPEGState"); ++ return; ++ } + + (void) flags; + if (TIFFFieldSet(tif,FIELD_JPEGTABLES)) +diff -ru tiff-3.8.2/libtiff/tif_next.c tiff-3.8.2-goo/libtiff/tif_next.c +--- tiff-3.8.2/libtiff/tif_next.c 2005-12-21 12:33:56.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_next.c 2006-07-14 13:52:00.556567000 +0100 +@@ -105,11 +105,16 @@ + * as codes of the form <color><npixels> + * until we've filled the scanline. + */ ++ /* ++ * Ensure the run does not exceed the scanline ++ * bounds, potentially resulting in a security issue. ++ * -- taviso(a)google.com 14 Jun 2006. ++ */ + op = row; + for (;;) { + grey = (n>>6) & 0x3; + n &= 0x3f; +- while (n-- > 0) ++ while (n-- > 0 && npixels < imagewidth) + SETPIXEL(op, grey); + if (npixels >= (int) imagewidth) + break; +diff -ru tiff-3.8.2/libtiff/tif_pixarlog.c tiff-3.8.2-goo/libtiff/tif_pixarlog.c +--- tiff-3.8.2/libtiff/tif_pixarlog.c 2006-03-21 16:42:50.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_pixarlog.c 2006-07-14 13:52:00.483557000 +0100 +@@ -768,7 +768,19 @@ + if (tif->tif_flags & TIFF_SWAB) + TIFFSwabArrayOfShort(up, nsamples); + +- for (i = 0; i < nsamples; i += llen, up += llen) { ++ /* ++ * if llen is not an exact multiple of nsamples, the decode operation ++ * may overflow the output buffer, so truncate it enough to prevent that ++ * but still salvage as much data as possible. ++ * -- taviso(a)google.com 14th June 2006 ++ */ ++ if (nsamples % llen) ++ TIFFWarningExt(tif->tif_clientdata, module, ++ "%s: stride %lu is not a multiple of sample count, " ++ "%lu, data truncated.", tif->tif_name, llen, nsamples); ++ ++ ++ for (i = 0; i < nsamples - (nsamples % llen); i += llen, up += llen) { + switch (sp->user_datafmt) { + case PIXARLOGDATAFMT_FLOAT: + horizontalAccumulateF(up, llen, sp->stride, +diff -ru tiff-3.8.2/libtiff/tif_read.c tiff-3.8.2-goo/libtiff/tif_read.c +--- tiff-3.8.2/libtiff/tif_read.c 2005-12-21 12:33:56.000000000 +0000 ++++ tiff-3.8.2-goo/libtiff/tif_read.c 2006-07-14 13:52:00.467568000 +0100 +@@ -31,6 +31,8 @@ + #include "tiffiop.h" + #include <stdio.h> + ++#include <limits.h> ++ + int TIFFFillStrip(TIFF*, tstrip_t); + int TIFFFillTile(TIFF*, ttile_t); + static int TIFFStartStrip(TIFF*, tstrip_t); +@@ -272,7 +274,13 @@ + if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) + _TIFFfree(tif->tif_rawdata); + tif->tif_flags &= ~TIFF_MYBUFFER; +- if ( td->td_stripoffset[strip] + bytecount > tif->tif_size) { ++ /* ++ * This sanity check could potentially overflow, causing an OOB read. ++ * verify that offset + bytecount is > offset. ++ * -- taviso(a)google.com 14 Jun 2006 ++ */ ++ if ( td->td_stripoffset[strip] + bytecount > tif->tif_size || ++ bytecount > (UINT_MAX - td->td_stripoffset[strip])) { + /* + * This error message might seem strange, but it's + * what would happen if a read were done instead. +@@ -470,7 +478,13 @@ + if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata) + _TIFFfree(tif->tif_rawdata); + tif->tif_flags &= ~TIFF_MYBUFFER; +- if ( td->td_stripoffset[tile] + bytecount > tif->tif_size) { ++ /* ++ * We must check this calculation doesnt overflow, potentially ++ * causing an OOB read. ++ * -- taviso(a)google.com 15 Jun 2006 ++ */ ++ if (td->td_stripoffset[tile] + bytecount > tif->tif_size || ++ bytecount > (UINT_MAX - td->td_stripoffset[tile])) { + tif->tif_curtile = NOTILE; + return (0); + }

1 0

r1761 - crux-2.2/ports/opt/scite
by crux＠crux.nu 23 Aug '06

23 Aug '06

Author: jue Date: 2006-08-23 11:37:35 +0200 (Wed, 23 Aug 2006) New Revision: 1761 Modified: crux-2.2/ports/opt/scite/.md5sum crux-2.2/ports/opt/scite/Pkgfile Log: scite: update to 1.71 Modified: crux-2.2/ports/opt/scite/.md5sum =================================================================== --- crux-2.2/ports/opt/scite/.md5sum 2006-08-22 15:48:14 UTC (rev 1760) +++ crux-2.2/ports/opt/scite/.md5sum 2006-08-23 09:37:35 UTC (rev 1761) @@ -1 +1 @@ -7af8e6e588978c865fc0fb0a6c7b73d9 scite170.zip +b62946c770686909a4d4d0e42de3754c scite171.tgz Modified: crux-2.2/ports/opt/scite/Pkgfile =================================================================== --- crux-2.2/ports/opt/scite/Pkgfile 2006-08-22 15:48:14 UTC (rev 1760) +++ crux-2.2/ports/opt/scite/Pkgfile 2006-08-23 09:37:35 UTC (rev 1761) @@ -4,15 +4,15 @@ # Depends on: gtk name=scite -version=170 +version=171 release=1 -source=(http://dl.sourceforge.net/sourceforge/scintilla/$name$version.zip) +source=(http://dl.sourceforge.net/sourceforge/scintilla/$name$version.tgz) build () { cd scintilla/gtk sed -i "/^CXXFLAGS/s/-Os/$CXXFLAGS/" makefile make GTK2=1 - + cd $SRC/$name/gtk sed -i "/^CXXTFLAGS/s/-Os/$CXXFLAGS/" makefile make GTK2=1 prefix=/usr

1 0

r1760 - crux-2.2/ports/opt/libmusicbrainz
by crux＠crux.nu 22 Aug '06

22 Aug '06

Author: tilman Date: 2006-08-22 17:48:14 +0200 (Tue, 22 Aug 2006) New Revision: 1760 Modified: crux-2.2/ports/opt/libmusicbrainz/.footprint crux-2.2/ports/opt/libmusicbrainz/.md5sum crux-2.2/ports/opt/libmusicbrainz/Pkgfile Log: libmusicbrainz: updated to 2.1.4 Modified: crux-2.2/ports/opt/libmusicbrainz/.footprint =================================================================== --- crux-2.2/ports/opt/libmusicbrainz/.footprint 2006-08-22 15:41:28 UTC (rev 1759) +++ crux-2.2/ports/opt/libmusicbrainz/.footprint 2006-08-22 15:48:14 UTC (rev 1760) @@ -9,8 +9,8 @@ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libmusicbrainz.a -rwxr-xr-x root/root usr/lib/libmusicbrainz.la -lrwxrwxrwx root/root usr/lib/libmusicbrainz.so -> libmusicbrainz.so.4.0.0 -lrwxrwxrwx root/root usr/lib/libmusicbrainz.so.4 -> libmusicbrainz.so.4.0.0 --rwxr-xr-x root/root usr/lib/libmusicbrainz.so.4.0.0 +lrwxrwxrwx root/root usr/lib/libmusicbrainz.so -> libmusicbrainz.so.4.0.2 +lrwxrwxrwx root/root usr/lib/libmusicbrainz.so.4 -> libmusicbrainz.so.4.0.2 +-rwxr-xr-x root/root usr/lib/libmusicbrainz.so.4.0.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libmusicbrainz.pc Modified: crux-2.2/ports/opt/libmusicbrainz/.md5sum =================================================================== --- crux-2.2/ports/opt/libmusicbrainz/.md5sum 2006-08-22 15:41:28 UTC (rev 1759) +++ crux-2.2/ports/opt/libmusicbrainz/.md5sum 2006-08-22 15:48:14 UTC (rev 1760) @@ -1 +1 @@ -88d35af903665fecbdee77eb6d5e6cdd libmusicbrainz-2.1.2.tar.gz +98bf1e102dda3b6ec3e72e1426445489 libmusicbrainz-2.1.4.tar.gz Modified: crux-2.2/ports/opt/libmusicbrainz/Pkgfile =================================================================== --- crux-2.2/ports/opt/libmusicbrainz/Pkgfile 2006-08-22 15:41:28 UTC (rev 1759) +++ crux-2.2/ports/opt/libmusicbrainz/Pkgfile 2006-08-22 15:48:14 UTC (rev 1760) @@ -4,7 +4,7 @@ # Depends on: expat name=libmusicbrainz -version=2.1.2 +version=2.1.4 release=1 source=(http://ftp.musicbrainz.org/pub/musicbrainz/$name-$version.tar.gz)

1 0

r1759 - crux-2.2/ports/opt/centericq
by crux＠crux.nu 22 Aug '06

22 Aug '06

Author: viper Date: 2006-08-22 17:41:28 +0200 (Tue, 22 Aug 2006) New Revision: 1759 Modified: crux-2.2/ports/opt/centericq/Pkgfile Log: centericq: fixed the autoconf problems; thanks to Tilman! Modified: crux-2.2/ports/opt/centericq/Pkgfile =================================================================== --- crux-2.2/ports/opt/centericq/Pkgfile 2006-08-22 14:53:26 UTC (rev 1758) +++ crux-2.2/ports/opt/centericq/Pkgfile 2006-08-22 15:41:28 UTC (rev 1759) @@ -6,7 +6,7 @@ name=centericq version=4.21.0 -release=2 +release=3 source=(http://thekonst.net/download/$name-$version.tar.bz2) build() { @@ -15,12 +15,20 @@ for dir in \ connwrap-0.1 firetalk-0.1 kkconsui-0.1 \ kkstrtext-0.1 kksystr-0.1 libgadu-0.1 \ - libicq2000-0.1 libjabber-0.1 libmsn-0.1 libyahoo2-0.1 + libjabber-0.1 libyahoo2-0.1 do cd $dir autoconf cd .. done + + for dir in \ + libicq2000-0.1 libmsn-0.1 + do + cd $dir + autoreconf --install --force + cd .. + done ./configure --prefix=/usr --disable-nls --mandir=/usr/man make

1 0

r1758 - in crux-2.2/ports/opt: glib pango
by crux＠crux.nu 22 Aug '06

22 Aug '06

Author: jaeger Date: 2006-08-22 16:53:26 +0200 (Tue, 22 Aug 2006) New Revision: 1758 Modified: crux-2.2/ports/opt/glib/Pkgfile crux-2.2/ports/opt/pango/Pkgfile Log: glib, pango: fixed source urls Modified: crux-2.2/ports/opt/glib/Pkgfile =================================================================== --- crux-2.2/ports/opt/glib/Pkgfile 2006-08-22 13:22:52 UTC (rev 1757) +++ crux-2.2/ports/opt/glib/Pkgfile 2006-08-22 14:53:26 UTC (rev 1758) @@ -5,7 +5,7 @@ name=glib version=2.12.1 release=1 -source=(ftp://ftp.gtk.org/pub/gtk/v2.12/$name-$version.tar.bz2) +source=(ftp://ftp.gtk.org/pub/$name/2.12/$name-$version.tar.bz2) build () { cd $name-$version Modified: crux-2.2/ports/opt/pango/Pkgfile =================================================================== --- crux-2.2/ports/opt/pango/Pkgfile 2006-08-22 13:22:52 UTC (rev 1757) +++ crux-2.2/ports/opt/pango/Pkgfile 2006-08-22 14:53:26 UTC (rev 1758) @@ -6,7 +6,7 @@ name=pango version=1.12.3 release=1 -source=(ftp://ftp.gtk.org/pub/gtk/v2.10/$name-$version.tar.bz2 \ +source=(ftp://ftp.gtk.org/pub/$name/1.12/$name-$version.tar.bz2 \ pango.modules) build () {

1 0