From 363c212c76d4c4ecde05c6aa5e8bdc5f90669be6 Mon Sep 17 00:00:00 2001 From: hackbard Date: Mon, 5 Sep 2005 09:14:38 +0000 Subject: [PATCH] updated some base/toolchain packages, added sysfsutils and pcmciautils, xpdf --- doc/CHANGELOG | 6 + packages/base/hotplug/hotplug | 5 + .../linux-libc-headers/linux-libc-headers | 6 +- packages/base/linux/linux | 4 +- packages/base/sysfsutils/sysfsutils | 7 + packages/base/udev/udev | 4 +- packages/hackbard/hostap/hostap | 4 +- packages/hackbard/pcmciautils/pcmciautils | 12 + .../linux-libc-headers/linux-libc-headers | 6 +- packages/toolchain/linux/linux | 4 +- packages/x11/xpdf/lfs.patch | 44 --- packages/x11/xpdf/pl1.patch | 315 ------------------ packages/x11/xpdf/pl2.patch | 54 --- packages/x11/xpdf/pl3.patch | 14 - packages/x11/xpdf/xpdf | 7 +- 15 files changed, 50 insertions(+), 442 deletions(-) create mode 100644 packages/base/sysfsutils/sysfsutils create mode 100644 packages/hackbard/pcmciautils/pcmciautils delete mode 100644 packages/x11/xpdf/lfs.patch delete mode 100644 packages/x11/xpdf/pl1.patch delete mode 100644 packages/x11/xpdf/pl2.patch delete mode 100644 packages/x11/xpdf/pl3.patch diff --git a/doc/CHANGELOG b/doc/CHANGELOG index a5a57d7..416a403 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,5 +1,11 @@ *) 2005-08-27 +- added pcmciautils and sysfsutils package +- updated some base/toolchain packages +- updated xpdf, and hostap + +*) 2005-08-27 + - cvs download compression changed to -z3 - fixed nfs-utils init script - updated/fixed hdw-get stuff diff --git a/packages/base/hotplug/hotplug b/packages/base/hotplug/hotplug index 6978101..0113ddf 100644 --- a/packages/base/hotplug/hotplug +++ b/packages/base/hotplug/hotplug @@ -5,3 +5,8 @@ # [V] 2004_09_23 # [S] 2-7 # [D] hotplug-2004_09_23.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/ + +post_install() { + cp etc/hotplug/pnp.distmap $root/etc/hotplug/ + mkdir -p $root/lib/firmware $root/var/lock/subsys + } diff --git a/packages/base/linux-libc-headers/linux-libc-headers b/packages/base/linux-libc-headers/linux-libc-headers index bafc588..d47b7a2 100644 --- a/packages/base/linux-libc-headers/linux-libc-headers +++ b/packages/base/linux-libc-headers/linux-libc-headers @@ -2,13 +2,15 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.6.11.2 +# [V] 2.6.12.0 # [S] 2-2 -# [D] linux-libc-headers-2.6.11.2.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ +# [D] linux-libc-headers-2.6.12.0.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ arch=${hdw_arch//ia32/i386} build_main() { + rm -rf $prefix/include/asm + rm -rf $prefix/include/linux cp -R include/asm-${arch} $prefix/include/asm cp -R include/linux $prefix/include chown -R root.root $prefix/include/{asm,linux} diff --git a/packages/base/linux/linux b/packages/base/linux/linux index f047e05..b2b91cd 100644 --- a/packages/base/linux/linux +++ b/packages/base/linux/linux @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.6.12.2 +# [V] 2.6.13 # [S] 2-2 -# [D] linux-2.6.12.2.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +# [D] linux-2.6.13.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ custmain="1" custmain() { diff --git a/packages/base/sysfsutils/sysfsutils b/packages/base/sysfsutils/sysfsutils new file mode 100644 index 0000000..2e8e8b9 --- /dev/null +++ b/packages/base/sysfsutils/sysfsutils @@ -0,0 +1,7 @@ +# hdw - linux sysfsutils package +# +# author: hackbard@hackdaworld.dyndns.org +# +# [V] 1.1.0 +# [S] 2-7 +# [D] sysfsutils-1.1.0.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ diff --git a/packages/base/udev/udev b/packages/base/udev/udev index bf258f0..380b3cf 100644 --- a/packages/base/udev/udev +++ b/packages/base/udev/udev @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 067 +# [V] 068 # [S] 1-9 2-15 -# [D] udev-067.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/ +# [D] udev-068.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/ make_conf="udevdir=/dev $make_conf" install_conf="udevdir=/dev" diff --git a/packages/hackbard/hostap/hostap b/packages/hackbard/hostap/hostap index 5b91e51..55b30fe 100644 --- a/packages/hackbard/hostap/hostap +++ b/packages/hackbard/hostap/hostap @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.4.1 +# [V] 0.4.4 # [S] 3-9 -# [D] hostap-driver-0.4.1.tar.gz http://hostap.epitest.fi/releases/ +# [D] hostap-driver-0.4.4.tar.gz http://hostap.epitest.fi/releases/ ## [D] hostap-utils-0.1.3.tar.gz http://hostap.epitest.fi/releases/ ## [D] hostapd-0.1.3.tar.gz http://hostap.epitest.fi/releases/ diff --git a/packages/hackbard/pcmciautils/pcmciautils b/packages/hackbard/pcmciautils/pcmciautils new file mode 100644 index 0000000..30504c6 --- /dev/null +++ b/packages/hackbard/pcmciautils/pcmciautils @@ -0,0 +1,12 @@ +# hdw - linux pcmciasutils package +# +# author: hackbard@hackdaworld.dyndns.org +# +# [V] 008 +# [S] 3-8 +# [D] pcmciautils-008.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/ + +kver=`grep '^#\ \[V\]' $confdir/../../base/linux/linux | awk '{ print $3 }'` + +make_conf="KERNEL_DIR=$root/lib/modules/$kver/build $make_conf" +install_conf="KERNEL_DIR=$root/lib/modules/$kver/build $install_conf" diff --git a/packages/toolchain/linux-libc-headers/linux-libc-headers b/packages/toolchain/linux-libc-headers/linux-libc-headers index 1384f8b..76cd22e 100644 --- a/packages/toolchain/linux-libc-headers/linux-libc-headers +++ b/packages/toolchain/linux-libc-headers/linux-libc-headers @@ -2,13 +2,15 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.6.11.2 +# [V] 2.6.12.0 # [S] 0-1 -# [D] linux-libc-headers-2.6.11.2.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ +# [D] linux-libc-headers-2.6.12.0.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ arch=${hdw_arch//ia32/i386} build_main() { + rm -rf $prefix/include/asm + rm -rf $prefix/include/linux cp -R include/asm-${arch} $prefix/include/asm cp -R include/linux $prefix/include } diff --git a/packages/toolchain/linux/linux b/packages/toolchain/linux/linux index cde144f..2cec76e 100644 --- a/packages/toolchain/linux/linux +++ b/packages/toolchain/linux/linux @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.6.12.2 +# [V] 2.6.13 # [S] 0-2 -# [D] linux-2.6.12.2.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +# [D] linux-2.6.13.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ skip=1 s_reason="i think thats obsolete now ..." diff --git a/packages/x11/xpdf/lfs.patch b/packages/x11/xpdf/lfs.patch deleted file mode 100644 index 8c9b1bc..0000000 --- a/packages/x11/xpdf/lfs.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- xpdf-3.00-orig/configure 2004-01-22 01:26:44.000000000 +0000 -+++ xpdf-3.00/configure 2004-12-18 17:42:34.787719704 +0000 -@@ -9007,6 +9007,9 @@ - - - -+ cat >>confdefs.h <<_ACEOF -+#include -+_ACEOF - - - -@@ -9817,7 +9820,7 @@ - { (exit 1); exit 1; }; } - fi - else -- libpaper_CFLAGS= -+ libpaper_CFLAGS="-I/usr/include/freetype2" - fi - - smr_test_CPPFLAGS="${CPPFLAGS+set}" - -diff -ur xpdf-3.00.orig/splash/SplashFTFontEngine.h xpdf-3.00/splash/SplashFTFontEngine.h ---- xpdf-3.00.orig/splash/SplashFTFontEngine.h 2004-01-21 19:26:44.000000000 -0600 -+++ xpdf-3.00/splash/SplashFTFontEngine.h 2004-03-20 10:23:32.000000000 -0600 -@@ -15,6 +15,7 @@ - #pragma interface - #endif - -+#include - #include - #include "gtypes.h" - -diff -ur xpdf-3.00.orig/splash/SplashFTFontFile.h xpdf-3.00/splash/SplashFTFontFile.h ---- xpdf-3.00.orig/splash/SplashFTFontFile.h 2004-01-21 19:26:44.000000000 -0600 -+++ xpdf-3.00/splash/SplashFTFontFile.h 2004-03-20 10:22:58.000000000 -0600 -@@ -15,6 +15,7 @@ - #pragma interface - #endif - -+#include - #include - #include "SplashFontFile.h" - diff --git a/packages/x11/xpdf/pl1.patch b/packages/x11/xpdf/pl1.patch deleted file mode 100644 index b21015d..0000000 --- a/packages/x11/xpdf/pl1.patch +++ /dev/null @@ -1,315 +0,0 @@ -*** ./xpdf/XRef.cc.orig Thu Jul 22 11:04:22 2004 ---- ./xpdf/XRef.cc Thu Jul 22 11:04:31 2004 -*************** -*** 96,102 **** - } - nObjects = obj1.getInt(); - obj1.free(); -! if (nObjects == 0) { - goto err1; - } - ---- 96,102 ---- - } - nObjects = obj1.getInt(); - obj1.free(); -! if (nObjects <= 0) { - goto err1; - } - -*************** -*** 106,111 **** ---- 106,114 ---- - } - first = obj1.getInt(); - obj1.free(); -+ if (first < 0) { -+ goto err1; -+ } - - objs = new Object[nObjects]; - objNums = (int *)gmalloc(nObjects * sizeof(int)); -*************** -*** 130,135 **** ---- 133,144 ---- - offsets[i] = obj2.getInt(); - obj1.free(); - obj2.free(); -+ if (objNums[i] < 0 || offsets[i] < 0 || -+ (i > 0 && offsets[i] < offsets[i-1])) { -+ delete parser; -+ gfree(offsets); -+ goto err1; -+ } - } - while (str->getChar() != EOF) ; - delete parser; -*************** -*** 369,378 **** - } - n = obj.getInt(); - obj.free(); - if (first + n > size) { - for (newSize = size ? 2 * size : 1024; -! first + n > newSize; - newSize <<= 1) ; - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; ---- 378,393 ---- - } - n = obj.getInt(); - obj.free(); -+ if (first < 0 || n < 0 || first + n < 0) { -+ goto err1; -+ } - if (first + n > size) { - for (newSize = size ? 2 * size : 1024; -! first + n > newSize && newSize > 0; - newSize <<= 1) ; -+ if (newSize < 0) { -+ goto err1; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -*************** -*** 443,449 **** - - // check for an 'XRefStm' key - if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { -! pos2 = obj2.getInt(); - readXRef(&pos2); - if (!ok) { - goto err1; ---- 458,464 ---- - - // check for an 'XRefStm' key - if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) { -! pos2 = (Guint)obj2.getInt(); - readXRef(&pos2); - if (!ok) { - goto err1; -*************** -*** 474,479 **** ---- 489,497 ---- - } - newSize = obj.getInt(); - obj.free(); -+ if (newSize < 0) { -+ goto err1; -+ } - if (newSize > size) { - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { -*************** -*** 494,499 **** ---- 512,520 ---- - } - w[i] = obj2.getInt(); - obj2.free(); -+ if (w[i] < 0 || w[i] > 4) { -+ goto err1; -+ } - } - obj.free(); - -*************** -*** 513,525 **** - } - n = obj.getInt(); - obj.free(); -! if (!readXRefStreamSection(xrefStr, w, first, n)) { - idx.free(); - goto err0; - } - } - } else { -! if (!readXRefStreamSection(xrefStr, w, 0, size)) { - idx.free(); - goto err0; - } ---- 534,547 ---- - } - n = obj.getInt(); - obj.free(); -! if (first < 0 || n < 0 || -! !readXRefStreamSection(xrefStr, w, first, n)) { - idx.free(); - goto err0; - } - } - } else { -! if (!readXRefStreamSection(xrefStr, w, 0, newSize)) { - idx.free(); - goto err0; - } -*************** -*** 551,560 **** - Guint offset; - int type, gen, c, newSize, i, j; - - if (first + n > size) { - for (newSize = size ? 2 * size : 1024; -! first + n > newSize; - newSize <<= 1) ; - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; ---- 573,588 ---- - Guint offset; - int type, gen, c, newSize, i, j; - -+ if (first + n < 0) { -+ return gFalse; -+ } - if (first + n > size) { - for (newSize = size ? 2 * size : 1024; -! first + n > newSize && newSize > 0; - newSize <<= 1) ; -+ if (newSize < 0) { -+ return gFalse; -+ } - entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry)); - for (i = size; i < newSize; ++i) { - entries[i].offset = 0xffffffff; -*************** -*** 585,608 **** - } - gen = (gen << 8) + c; - } -! switch (type) { -! case 0: -! entries[i].offset = offset; -! entries[i].gen = gen; -! entries[i].type = xrefEntryFree; -! break; -! case 1: -! entries[i].offset = offset; -! entries[i].gen = gen; -! entries[i].type = xrefEntryUncompressed; -! break; -! case 2: -! entries[i].offset = offset; -! entries[i].gen = gen; -! entries[i].type = xrefEntryCompressed; -! break; -! default: -! return gFalse; - } - } - ---- 613,638 ---- - } - gen = (gen << 8) + c; - } -! if (entries[i].offset == 0xffffffff) { -! switch (type) { -! case 0: -! entries[i].offset = offset; -! entries[i].gen = gen; -! entries[i].type = xrefEntryFree; -! break; -! case 1: -! entries[i].offset = offset; -! entries[i].gen = gen; -! entries[i].type = xrefEntryUncompressed; -! break; -! case 2: -! entries[i].offset = offset; -! entries[i].gen = gen; -! entries[i].type = xrefEntryCompressed; -! break; -! default: -! return gFalse; -! } - } - } - -*************** -*** 664,701 **** - // look for object - } else if (isdigit(*p)) { - num = atoi(p); -! do { -! ++p; -! } while (*p && isdigit(*p)); -! if (isspace(*p)) { - do { - ++p; -! } while (*p && isspace(*p)); -! if (isdigit(*p)) { -! gen = atoi(p); - do { - ++p; -! } while (*p && isdigit(*p)); -! if (isspace(*p)) { - do { - ++p; -! } while (*p && isspace(*p)); -! if (!strncmp(p, "obj", 3)) { -! if (num >= size) { -! newSize = (num + 1 + 255) & ~255; -! entries = (XRefEntry *) -! grealloc(entries, newSize * sizeof(XRefEntry)); -! for (i = size; i < newSize; ++i) { -! entries[i].offset = 0xffffffff; -! entries[i].type = xrefEntryFree; - } -- size = newSize; -- } -- if (entries[num].type == xrefEntryFree || -- gen >= entries[num].gen) { -- entries[num].offset = pos - start; -- entries[num].gen = gen; -- entries[num].type = xrefEntryUncompressed; - } - } - } ---- 694,737 ---- - // look for object - } else if (isdigit(*p)) { - num = atoi(p); -! if (num > 0) { - do { - ++p; -! } while (*p && isdigit(*p)); -! if (isspace(*p)) { - do { - ++p; -! } while (*p && isspace(*p)); -! if (isdigit(*p)) { -! gen = atoi(p); - do { - ++p; -! } while (*p && isdigit(*p)); -! if (isspace(*p)) { -! do { -! ++p; -! } while (*p && isspace(*p)); -! if (!strncmp(p, "obj", 3)) { -! if (num >= size) { -! newSize = (num + 1 + 255) & ~255; -! if (newSize < 0) { -! error(-1, "Bad object number"); -! return gFalse; -! } -! entries = (XRefEntry *) -! grealloc(entries, newSize * sizeof(XRefEntry)); -! for (i = size; i < newSize; ++i) { -! entries[i].offset = 0xffffffff; -! entries[i].type = xrefEntryFree; -! } -! size = newSize; -! } -! if (entries[num].type == xrefEntryFree || -! gen >= entries[num].gen) { -! entries[num].offset = pos - start; -! entries[num].gen = gen; -! entries[num].type = xrefEntryUncompressed; - } - } - } - } - - diff --git a/packages/x11/xpdf/pl2.patch b/packages/x11/xpdf/pl2.patch deleted file mode 100644 index a491dda..0000000 --- a/packages/x11/xpdf/pl2.patch +++ /dev/null @@ -1,54 +0,0 @@ -*** ./xpdf/Gfx.cc.orig Sun Dec 12 16:04:43 2004 ---- ./xpdf/Gfx.cc Sun Dec 12 16:05:16 2004 -*************** -*** 2654,2660 **** - haveMask = gFalse; - dict->lookup("Mask", &maskObj); - if (maskObj.isArray()) { -! for (i = 0; i < maskObj.arrayGetLength(); ++i) { - maskObj.arrayGet(i, &obj1); - maskColors[i] = obj1.getInt(); - obj1.free(); ---- 2654,2662 ---- - haveMask = gFalse; - dict->lookup("Mask", &maskObj); - if (maskObj.isArray()) { -! for (i = 0; -! i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; -! ++i) { - maskObj.arrayGet(i, &obj1); - maskColors[i] = obj1.getInt(); - obj1.free(); -*** ./xpdf/GfxState.cc.orig Sun Dec 12 16:04:48 2004 ---- ./xpdf/GfxState.cc Sun Dec 12 16:06:38 2004 -*************** -*** 708,713 **** ---- 708,718 ---- - } - nCompsA = obj2.getInt(); - obj2.free(); -+ if (nCompsA > gfxColorMaxComps) { -+ error(-1, "ICCBased color space with too many (%d > %d) components", -+ nCompsA, gfxColorMaxComps); -+ nCompsA = gfxColorMaxComps; -+ } - if (dict->lookup("Alternate", &obj2)->isNull() || - !(altA = GfxColorSpace::parse(&obj2))) { - switch (nCompsA) { -*************** -*** 1054,1060 **** - } - nCompsA = obj1.arrayGetLength(); - if (nCompsA > gfxColorMaxComps) { -! error(-1, "DeviceN color space with more than %d > %d components", - nCompsA, gfxColorMaxComps); - nCompsA = gfxColorMaxComps; - } ---- 1059,1065 ---- - } - nCompsA = obj1.arrayGetLength(); - if (nCompsA > gfxColorMaxComps) { -! error(-1, "DeviceN color space with too many (%d > %d) components", - nCompsA, gfxColorMaxComps); - nCompsA = gfxColorMaxComps; - } diff --git a/packages/x11/xpdf/pl3.patch b/packages/x11/xpdf/pl3.patch deleted file mode 100644 index 8e489e0..0000000 --- a/packages/x11/xpdf/pl3.patch +++ /dev/null @@ -1,14 +0,0 @@ -*** ./xpdf/XRef.cc.orig Wed Jan 12 17:10:53 2005 ---- ./xpdf/XRef.cc Wed Jan 12 17:11:22 2005 -*************** -*** 793,798 **** ---- 793,801 ---- - } else { - keyLength = 5; - } -+ if (keyLength > 16) { -+ keyLength = 16; -+ } - permFlags = permissions.getInt(); - if (encVersion >= 1 && encVersion <= 2 && - encRevision >= 2 && encRevision <= 3) { diff --git a/packages/x11/xpdf/xpdf b/packages/x11/xpdf/xpdf index 56be277..db672cd 100644 --- a/packages/x11/xpdf/xpdf +++ b/packages/x11/xpdf/xpdf @@ -2,11 +2,12 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 3.00-linux +# [V] 3.01 # [S] 3-7 -# [D] xpdf-3.00.tar.gz ftp://ftp.foolabs.com/pub/xpdf/ +# [D] xpdf-3.01.tar.gz ftp://ftp.foolabs.com/pub/xpdf/ -confopt="$confopt --enable-a4-paper --with-gzip" +confopt="$confopt --enable-a4-paper --with-gzip --enable-opi --enable-wordlist" +confopt="$confopt --enable-multithreaded" [ -d $prefix/include/freetype2 ] && \ confopt="$confopt --with-freetype2-includes=$prefix/include/freetype2" -- 2.39.2