summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini4
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--packages/aiostress/aiostress_0.0.bb3
-rw-r--r--packages/aircrack/aircrack-ng_0.9.bb26
-rw-r--r--packages/bluez/bluez-gnome_0.6.bb2
-rw-r--r--packages/bluez/bluez-gnome_cvs.bb2
-rw-r--r--packages/hdparm/hdparm-6.9/uclibc.patch33
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.21/defconfig1
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.1.bb (renamed from packages/linux/ixp4xx-kernel_2.6.21.bb)2
-rw-r--r--packages/nano/nano-2.0.6/.mtn2git_empty (renamed from packages/clucene/.mtn2git_empty)0
-rw-r--r--packages/nano/nano-2.0.6/glib.m4 (renamed from packages/nano/nano-1.3.9/glib.m4)0
-rw-r--r--packages/nano/nano_2.0.6.bb (renamed from packages/nano/nano_1.3.9.bb)2
-rw-r--r--packages/nonworking/clucene/.mtn2git_empty (renamed from packages/clucene/clucene-0.8.12-pre/.mtn2git_empty)0
-rw-r--r--packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty (renamed from packages/nano/nano-1.3.9/.mtn2git_empty)0
-rw-r--r--packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch (renamed from packages/clucene/clucene-0.8.12-pre/compile-fix.patch)0
-rw-r--r--packages/nonworking/clucene/clucene_0.8.12-pre.bb (renamed from packages/clucene/clucene_0.8.12-pre.bb)0
-rw-r--r--packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro4
-rw-r--r--packages/uclibc/uclibc_0.9.29.bb2
18 files changed, 69 insertions, 14 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index ce7c9adf7b..953b5a14ea 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2115,8 +2115,8 @@ md5=c6b1aa28bfecdd0c693a2afc43d7679e
sha256=d5b93fb8dbfa73e4a542bb8ad7d61c8b48dcf79948da26da9e9ef3b1a49c4221
[http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
-md5=815b8e5bd71c19d6af96aed6bf9e2ee7
-sha256=db61f4ac7e3fe252d6d547ff2ddd25a2f5411afd42c05f4d1efd6038a7d09e3d
+md5=e006cde4b4a28cfce95e43710cd126a9
+sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
[http://downloads.sourceforge.net/atmelwlandriver/atmelwlandriver-3.3.5.6.tar.bz2]
md5=dd9a11d175ba0fbb62cf7fec5426f5de
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 4c7dd422c3..8679300bc3 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
# Select the correct versions of the kernel and modules (these are the
# defaults, override in the conf/distro top-level distro file).
PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1"
# Select the smallest provider of x11 libraries
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/packages/aiostress/aiostress_0.0.bb b/packages/aiostress/aiostress_0.0.bb
index 8b4085ad4f..9ebc20d371 100644
--- a/packages/aiostress/aiostress_0.0.bb
+++ b/packages/aiostress/aiostress_0.0.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "Asynchronous I/O stress util"
LICENSE = "GPLv2"
DEPENDS = "libaio"
+PR="r1"
-SRC_URI = "ftp://ftp.suse.com/pub/people/mason/utils/aio-stress.c;md5sum=727e5fc3566837b3ea72f887d048769b"
+SRC_URI = "http://mirrors.easynews.com/linux/suse/people/mason/utils/aio-stress.c"
S = "${WORKDIR}"
diff --git a/packages/aircrack/aircrack-ng_0.9.bb b/packages/aircrack/aircrack-ng_0.9.bb
new file mode 100644
index 0000000000..d19e2e2065
--- /dev/null
+++ b/packages/aircrack/aircrack-ng_0.9.bb
@@ -0,0 +1,26 @@
+SECTION = "console/network"
+DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
+HOMEPAGE = "http://www.aircrack-ng.org/"
+LICENSE = "GPLv2"
+PR = "r2"
+
+SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
+
+oe_compile() {
+ oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-O3 ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
+}
+
+do_install() {
+ install -d ${D}/${sbindir}
+ install -d ${D}/${bindir}
+ install -m 0755 airodump-ng ${D}/${sbindir}
+ install -m 0755 aircrack-ng ${D}/${bindir}
+ install -m 0755 aireplay-ng ${D}/${sbindir}
+ install -m 0755 airdecap-ng ${D}/${bindir}
+ install -m 0755 packetforge-ng ${D}/${bindir}
+ install -m 0755 airmon-ng ${D}/${sbindir}
+ install -m 0755 ivstools ${D}/${bindir}
+ install -m 0755 kstats ${D}/${bindir}
+ install -m 0755 airtun-ng ${D}/${sbindir}
+ install -m 0755 makeivs ${D}/${bindir}
+}
diff --git a/packages/bluez/bluez-gnome_0.6.bb b/packages/bluez/bluez-gnome_0.6.bb
index b8b7511cbf..d50e8e5fde 100644
--- a/packages/bluez/bluez-gnome_0.6.bb
+++ b/packages/bluez/bluez-gnome_0.6.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "BLuetooth configuration applet"
LICENSE = "GPL+LGPL"
-DEPENDS = "bluez-libs dbus-glib gconf libnotify gtk+ openobex"
+DEPENDS = "dbus-glib gconf libnotify gtk+"
SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb
index f30bbdd7ad..448e157f3d 100644
--- a/packages/bluez/bluez-gnome_cvs.bb
+++ b/packages/bluez/bluez-gnome_cvs.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "BLuetooth configuration applet"
LICENSE = "GPL+LGPL"
-DEPENDS = "bluez-libs dbus-glib gconf libnotify gtk+ openobex"
+DEPENDS = "dbus-glib gconf libnotify gtk+"
SRC_URI = "cvs://anonymous@cvs.bluez.org/cvsroot/bluez;module=gnome"
diff --git a/packages/hdparm/hdparm-6.9/uclibc.patch b/packages/hdparm/hdparm-6.9/uclibc.patch
index 0758aa07b8..b1d8e4aa47 100644
--- a/packages/hdparm/hdparm-6.9/uclibc.patch
+++ b/packages/hdparm/hdparm-6.9/uclibc.patch
@@ -1,7 +1,7 @@
Index: hdparm-6.9/hdparm.c
===================================================================
---- hdparm-6.9.orig/hdparm.c 2007-03-05 14:02:03.000000000 +0100
-+++ hdparm-6.9/hdparm.c 2007-03-05 14:02:23.000000000 +0100
+--- hdparm-6.9.orig/hdparm.c 2007-05-20 20:12:58.000000000 +0200
++++ hdparm-6.9/hdparm.c 2007-05-20 20:13:31.000000000 +0200
@@ -16,7 +16,9 @@
#include <sys/times.h>
#include <sys/types.h>
@@ -12,10 +12,37 @@ Index: hdparm-6.9/hdparm.c
#include <linux/hdreg.h>
#include <linux/major.h>
#include <byteswap.h>
+@@ -1311,7 +1313,7 @@
+ perror(" HDIO_GET_IDENTITY failed");
+ }
+ if (get_IDentity) {
+- __u16 *id;
++ uint16_t *id;
+ unsigned char args[4+512] = {WIN_IDENTIFY,0,0,1,}; // FIXME?
+ unsigned i;
+ if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
+@@ -1321,7 +1323,7 @@
+ goto identify_abort;
+ }
+ }
+- id = (__u16 *)&args[4];
++ id = (uint16_t *)&args[4];
+ if (get_IDentity == 2) {
+ for (i = 0; i < (256/8); ++i) {
+ printf("%04x %04x %04x %04x %04x %04x %04x %04x\n", id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7]);
+@@ -1609,7 +1611,7 @@
+ && ishex(d[++digit] = getchar())
+ && ishex(d[++digit] = getchar())) {
+ sbuf[wc] = (fromhex(d[0]) << 12) | (fromhex(d[1]) << 8) | (fromhex(d[2]) << 4) | fromhex(d[3]);
+- le16_to_cpus((__u16 *)(&sbuf[wc]));
++ le16_to_cpus((uint16_t *)(&sbuf[wc]));
+ ++wc;
+ } else if (d[digit] == EOF) {
+ goto eof;
Index: hdparm-6.9/hdparm.h
===================================================================
--- hdparm-6.9.orig/hdparm.h 2006-04-28 16:33:01.000000000 +0200
-+++ hdparm-6.9/hdparm.h 2007-03-05 14:03:10.000000000 +0100
++++ hdparm-6.9/hdparm.h 2007-05-20 20:12:58.000000000 +0200
@@ -1,6 +1,6 @@
/* Some prototypes for extern functions. */
diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
index 1bf8a6317a..15b4ba5829 100644
--- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig
@@ -1164,7 +1164,6 @@ CONFIG_I2C_IXP4XX=y
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PASEMI is not set
# CONFIG_I2C_PROSAVAGE is not set
# CONFIG_I2C_SAVAGE4 is not set
# CONFIG_I2C_SIS5595 is not set
diff --git a/packages/linux/ixp4xx-kernel_2.6.21.bb b/packages/linux/ixp4xx-kernel_2.6.21.1.bb
index 59951942c2..8025465058 100644
--- a/packages/linux/ixp4xx-kernel_2.6.21.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.21.1.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "839"
+IXP4XX_KERNEL_SVN_REV = "847"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/clucene/.mtn2git_empty b/packages/nano/nano-2.0.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/clucene/.mtn2git_empty
+++ b/packages/nano/nano-2.0.6/.mtn2git_empty
diff --git a/packages/nano/nano-1.3.9/glib.m4 b/packages/nano/nano-2.0.6/glib.m4
index b8094bbfe0..b8094bbfe0 100644
--- a/packages/nano/nano-1.3.9/glib.m4
+++ b/packages/nano/nano-2.0.6/glib.m4
diff --git a/packages/nano/nano_1.3.9.bb b/packages/nano/nano_2.0.6.bb
index c82f5e2327..f6ef365591 100644
--- a/packages/nano/nano_1.3.9.bb
+++ b/packages/nano/nano_2.0.6.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
SECTION = "console/utils"
DEPENDS = "ncurses"
-SRC_URI = "http://www.nano-editor.org/dist/v1.3/nano-${PV}.tar.gz \
+SRC_URI = "http://www.nano-editor.org/dist/v2.0/nano-${PV}.tar.gz \
file://glib.m4"
inherit autotools
diff --git a/packages/clucene/clucene-0.8.12-pre/.mtn2git_empty b/packages/nonworking/clucene/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/clucene/clucene-0.8.12-pre/.mtn2git_empty
+++ b/packages/nonworking/clucene/.mtn2git_empty
diff --git a/packages/nano/nano-1.3.9/.mtn2git_empty b/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nano/nano-1.3.9/.mtn2git_empty
+++ b/packages/nonworking/clucene/clucene-0.8.12-pre/.mtn2git_empty
diff --git a/packages/clucene/clucene-0.8.12-pre/compile-fix.patch b/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch
index 5f6c8f1911..5f6c8f1911 100644
--- a/packages/clucene/clucene-0.8.12-pre/compile-fix.patch
+++ b/packages/nonworking/clucene/clucene-0.8.12-pre/compile-fix.patch
diff --git a/packages/clucene/clucene_0.8.12-pre.bb b/packages/nonworking/clucene/clucene_0.8.12-pre.bb
index 2c8122c921..2c8122c921 100644
--- a/packages/clucene/clucene_0.8.12-pre.bb
+++ b/packages/nonworking/clucene/clucene_0.8.12-pre.bb
diff --git a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro
index 335e6c2bf5..b326ff03b5 100644
--- a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro
+++ b/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro
@@ -25,8 +25,8 @@ MALLOC_STANDARD=y
MALLOC_GLIBC_COMPAT=y
UCLIBC_DYNAMIC_ATEXIT=y
COMPAT_ATEXIT=y
-# UCLIBC_SUSV3_LEGACY is not set
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
UCLIBC_HAS_SHADOW=y
# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
UCLIBC_HAS___PROGNAME=y
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index f84084ef84..00cb7afb75 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -14,6 +14,8 @@ require uclibc.inc
PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
SRC_URI += "file://uClibc.machine file://uClibc.distro"
+# mmap-unsigned-shift_bugid1303.patch
+# http://uclibc.org/lists/uclibc-cvs/2007-May/011360.html;patch=1"
#recent versions uclibc require real kernel headers
PACKAGE_ARCH = "${MACHINE_ARCH}"