summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-06-25 21:08:41 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-06-25 21:08:41 +0200
commit5cdeab06fe5b553185040d125da74b12f5ac6442 (patch)
tree91f2012fa4a7f13f4f6e87e13e5c854fea251fe4 /package
parentc98552118a8925f3927056294418543cdba736f7 (diff)
parent6f58e88ce0c721c8954898f81c9fbf8088fcba13 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/Config.in2
-rw-r--r--package/Makefile2
-rw-r--r--package/axtls/Makefile2
-rw-r--r--package/binutils/Makefile1
-rw-r--r--package/cbtt/Makefile1
-rw-r--r--package/cxxtools/Makefile2
-rw-r--r--package/gpg/patches/patch-mpi_longlong_h67
-rw-r--r--package/gsm/Makefile2
-rw-r--r--package/id3lib/Config.in1
-rw-r--r--package/id3lib/Makefile1
-rw-r--r--package/ipset/Makefile4
-rw-r--r--package/libiconv/Makefile1
-rw-r--r--package/libmad/Makefile9
-rw-r--r--package/libupnp/Makefile1
-rw-r--r--package/monit/patches/patch-Makefile_in11
-rw-r--r--package/mplayer/Config.in7
-rw-r--r--package/mplayer/Makefile1
-rw-r--r--package/mrd6/patches/patch-src_linux_mrd_components_cpp14
-rw-r--r--package/opensips/Makefile2
-rw-r--r--package/oprofile/Makefile2
-rw-r--r--package/portmap/Makefile1
-rw-r--r--package/rrs/Makefile4
-rw-r--r--package/rtorrent/Config.in10
-rw-r--r--package/sane-backends/patches/patch-configure_in11
-rw-r--r--package/squid/patches/patch-src_HttpHeaderTools_cc11
-rw-r--r--package/uclibc++/files/config8
-rw-r--r--package/uclibc++/files/config.mips57
-rw-r--r--package/uclibc++/files/config.x8657
-rw-r--r--package/udev/Config.in2
-rw-r--r--package/util-linux-ng/Config.in (renamed from package/util-linux/Config.in)14
-rw-r--r--package/util-linux-ng/Makefile (renamed from package/util-linux/Makefile)9
-rw-r--r--package/util-linux-ng/patches/patch-fdisk_cfdisk_c11
-rw-r--r--package/util-linux-ng/patches/patch-fdisk_fdiskbsdlabel_c (renamed from package/util-linux/patches/patch-fdisk_fdiskbsdlabel_c)7
-rw-r--r--package/util-linux-ng/patches/patch-fdisk_sfdisk_c35
-rw-r--r--package/util-linux-ng/patches/patch-login-utils_Makefile_in13
-rw-r--r--package/util-linux-ng/patches/patch-login-utils_ttymsg_c11
-rw-r--r--package/util-linux-ng/patches/patch-login-utils_wall_c11
-rw-r--r--package/util-linux-ng/patches/patch-misc-utils_cal_c18
-rw-r--r--package/util-linux-ng/patches/patch-misc-utils_logger_c11
-rw-r--r--package/util-linux-ng/patches/patch-misc-utils_whereis_c19
-rw-r--r--package/util-linux-ng/patches/patch-mount_mount_c (renamed from package/util-linux/patches/patch-mount_mount_c)9
-rw-r--r--package/util-linux-ng/patches/patch-mount_mount_mntent_c20
-rw-r--r--package/util-linux-ng/patches/patch-mount_sundries_c11
-rw-r--r--package/util-linux-ng/patches/patch-text-utils_colcrt_c (renamed from package/util-linux/patches/patch-text-utils_colcrt_c)5
-rw-r--r--package/util-linux-ng/patches/patch-text-utils_display_c (renamed from package/util-linux/patches/patch-text-utils_display_c)5
-rw-r--r--package/util-linux-ng/patches/patch-text-utils_parse_c (renamed from package/util-linux/patches/patch-text-utils_parse_c)5
-rw-r--r--package/util-linux/patches/patch-MCONFIG69
-rw-r--r--package/util-linux/patches/patch-disk-utils_fsck_cramfs_c11
-rw-r--r--package/util-linux/patches/patch-fdisk_cfdisk_c12
-rw-r--r--package/util-linux/patches/patch-fdisk_llseek_c11
-rw-r--r--package/util-linux/patches/patch-fdisk_sfdisk_c68
-rw-r--r--package/util-linux/patches/patch-fdisk_sfdisk_c.orig12
-rw-r--r--package/util-linux/patches/patch-misc-utils_logger_c12
-rw-r--r--package/util-linux/patches/patch-misc-utils_namei_c12
-rw-r--r--package/util-linux/patches/patch-misc-utils_whereis_c20
-rw-r--r--package/util-linux/patches/patch-mount_mntent_c30
-rw-r--r--package/util-linux/patches/patch-mount_mount_by_label_c12
-rw-r--r--package/util-linux/patches/patch-mount_sundries_c12
-rw-r--r--package/util-linux/patches/patch-mount_umount_c12
-rw-r--r--package/valgrind/Config.in2
-rw-r--r--package/xf86-video-geode/Config.in1
61 files changed, 331 insertions, 473 deletions
diff --git a/package/Config.in b/package/Config.in
index 3ea7feac5..96aeec3aa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -50,7 +50,7 @@ source "package/dosfstools/Config.in"
source "package/e2fsprogs/Config.in"
source "package/fuse/Config.in"
source "package/lvm/Config.in"
-source "package/util-linux/Config.in"
+source "package/util-linux-ng/Config.in"
source "package/wdfs/Config.in"
source "package/xfsprogs/Config.in"
endmenu
diff --git a/package/Makefile b/package/Makefile
index 5245918fb..68d6cc5f5 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -373,7 +373,7 @@ package-$(ADK_PACKAGE_UPDATEDD) += updatedd
package-$(ADK_COMPILE_USBUTILS) += usbutils
package-$(ADK_PACKAGE_USSP_PUSH) += ussp-push
package-$(ADK_PACKAGE_USTL) += ustl
-package-$(ADK_COMPILE_UTIL_LINUX) += util-linux
+package-$(ADK_COMPILE_UTIL_LINUX_NG) += util-linux-ng
package-$(ADK_PACKAGE_VALGRIND) += valgrind
package-$(ADK_PACKAGE_VGP) += vgp
package-$(ADK_PACKAGE_VIDEOPROTO) += videoproto
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index df231bc19..9b01f12ba 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -27,7 +27,7 @@ $(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PK
BUILD_STYLE= auto
XAKE_FLAGS+= STRIP='' \
CC='${TARGET_CC}' \
- OPT_CFLAGS='${TARGET_CFLAGS}' \
+ OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \
OPT_LDFLAGS=""
do-configure:
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 65b5d872e..c130804de 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -11,6 +11,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-werror
BUILD_STYLE= auto
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
index 75ed1ea60..913b2d8e6 100644
--- a/package/cbtt/Makefile
+++ b/package/cbtt/Makefile
@@ -40,6 +40,7 @@ TLDFLAGS+= -nodefaultlibs -lz -lpthread \
-luClibc++ -lc -lm -lgcc
TCFLAGS+= -fno-builtin -nostdinc++
endif
+TCFLAGS+= -fPIC
do-install:
${INSTALL_DIR} ${IDIR_CBTT}/usr/bin
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index dab8121eb..f3a270aa8 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -30,6 +30,8 @@ else
TLDFLAGS+= -liconv -shared
endif
+TCFLAGS+= -fPIC
+TCXXFLAGS+= -fPIC
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= ac_cv_lib_nsl_setsockopt=no
CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr'
diff --git a/package/gpg/patches/patch-mpi_longlong_h b/package/gpg/patches/patch-mpi_longlong_h
new file mode 100644
index 000000000..85fc65552
--- /dev/null
+++ b/package/gpg/patches/patch-mpi_longlong_h
@@ -0,0 +1,67 @@
+--- gnupg-1.4.9.orig/mpi/longlong.h 2007-10-23 11:15:14.000000000 +0200
++++ gnupg-1.4.9/mpi/longlong.h 2009-06-19 19:16:25.000000000 +0200
+@@ -706,18 +706,35 @@ extern USItype __udiv_qrnnd ();
+ #endif /* __m88110__ */
+ #endif /* __m88000__ */
+
++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
++#if defined (__GNUC__) && defined (__GNUC_MINOR__)
++#define __GNUC_PREREQ(maj, min) \
++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
++#else
++#define __GNUC_PREREQ(maj, min) 0
++#endif
++
+ /***************************************
+ ************** MIPS *****************
+ ***************************************/
+ #if defined (__mips__) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++ do { \
++ UDItype __ll = (UDItype)(u) * (v); \
++ w1 = __ll >> 32; \
++ w0 = __ll; \
++ } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("multu %2,%3" \
+ : "=l" ((USItype)(w0)), \
+ "=h" ((USItype)(w1)) \
+ : "d" ((USItype)(u)), \
+ "d" ((USItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("multu %2,%3 \n" \
+ "mflo %0 \n" \
+@@ -735,14 +752,24 @@ extern USItype __udiv_qrnnd ();
+ ************** MIPS/64 **************
+ ***************************************/
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if __GNUC_PREREQ (4,4)
++#define umul_ppmm(w1, w0, u, v) \
++ do { \
++ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
++ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \
++ w1 = __ll >> 64; \
++ w0 = __ll; \
++ } while (0)
++#endif
++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("dmultu %2,%3" \
+ : "=l" ((UDItype)(w0)), \
+ "=h" ((UDItype)(w1)) \
+ : "d" ((UDItype)(u)), \
+ "d" ((UDItype)(v)))
+-#else
++#endif
++#if !defined (umul_ppmm)
+ #define umul_ppmm(w1, w0, u, v) \
+ __asm__ ("dmultu %2,%3 \n" \
+ "mflo %0 \n" \
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index be9654bfa..dfa0cbb5c 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-XAKE_FLAGS+= COPTS="${TARGET_CFLAGS}" \
+XAKE_FLAGS+= COPTS="${TARGET_CFLAGS} -fPIC" \
INSTALL_ROOT="${WRKINST}"
BUILD_STYLE= auto
INSTALL_STYLE= auto
diff --git a/package/id3lib/Config.in b/package/id3lib/Config.in
index 302b8148d..973fbe453 100644
--- a/package/id3lib/Config.in
+++ b/package/id3lib/Config.in
@@ -4,6 +4,7 @@ config ADK_PACKAGE_ID3LIB
default n
depends on ADK_CXX
select ADK_PACKAGE_ZLIB
+ select ADK_PACKAGE_LIBICONV
help
An ID3v1/ID3v2 tagging library.
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 545a27e91..f7c7976a4 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -23,6 +23,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --enable-cxx-warnings=no
BUILD_STYLE:= auto
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 66b2c2014..da706009c 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -19,8 +19,8 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
XAKE_FLAGS+= V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
- PREFIX=/usr LD=$(TARGET_CROSS)ld \
- CROSS_COMPILE="${TARGET_CROSS}"
+ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \
+ LD=$(TARGET_CROSS)gcc
BUILD_STYLE= auto
INSTALL_STYLE= auto
INSTALL_TARGET= binaries_install
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index d4b092ba5..4f3063aad 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -16,6 +16,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE= gnu
BUILD_STYLE= auto
INSTALL_STYLE= auto confprog
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 3b6d14be2..045bd6d8e 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -21,16 +21,17 @@ FPM:=default
ifeq (${ARCH},i386)
FPM:=intel
endif
-ifeq (${ARCH},mips)
-FPM:=mips
-endif
+# MIPS optimization is broken for gcc 4.4 (removed h constraint)
+#ifeq (${ARCH},mips)
+#FPM:=mips
+#endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-fpm=${FPM} \
--disable-debugging \
--enable-speed
BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+INSTALL_STYLE= auto
pre-install:
${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 31f2cd6e9..248c73709 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+TCFLAGS+= -fPIC
CONFIGURE_STYLE:= autotool gnu
CONFIGURE_ARGS+= --disable-samples
BUILD_STYLE:= auto
diff --git a/package/monit/patches/patch-Makefile_in b/package/monit/patches/patch-Makefile_in
new file mode 100644
index 000000000..fd01136fd
--- /dev/null
+++ b/package/monit/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- monit-5.0.3.orig/Makefile.in 2009-05-25 21:02:56.000000000 +0200
++++ monit-5.0.3/Makefile.in 2009-06-19 21:30:29.000000000 +0200
+@@ -36,7 +36,7 @@ MODE_CONF = 600
+ MODE_DIRS = 755
+
+ INSTALL = @INSTALL@
+-INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS) -s
++INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS)
+ INSTALL_FILE = $(INSTALL) -m $(MODE_FILES)
+ INSTALL_DIR = $(INSTALL) -m $(MODE_DIRS) -d
+
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index 7255dfbbd..963e2c0ba 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -2,16 +2,17 @@ config ADK_PACKAGE_MPLAYER
prompt "mplayer........................... popular movie player"
tristate
default n
+ select ADK_PACKAGE_ALSA_LIB
select ADK_PACKAGE_LIBJPEG
select ADK_PACKAGE_LIBPNG
select ADK_PACKAGE_LIBPTHREAD
select ADK_PACKAGE_LIBOGG
- select ADK_PACKAGE_LIBVORBIS
select ADK_PACKAGE_LIBMAD
- select ADK_PACKAGE_ALSA_LIB
- select ADK_PACKAGE_ZLIB
select ADK_PACKAGE_LIBNCURSES
select ADK_PACKAGE_LIBFAAD2
+ select ADK_PACKAGE_LIBVORBIS
+ select ADK_PACKAGE_ZLIB
+ depends on ADK_LINUX_X86_ALIX1C
help
http://www.mplayerhq.hu
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 5d5812646..0c330a792 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -55,7 +55,6 @@ pre-configure:
--prefix=/usr \
--confdir=/etc \
--enable-cross-compile \
- --enable-runtime-cpudetection \
--target=$(REAL_GNU_TARGET_NAME) \
--cc=$(TARGET_CC) \
--host-cc=$(HOSTCC) \
diff --git a/package/mrd6/patches/patch-src_linux_mrd_components_cpp b/package/mrd6/patches/patch-src_linux_mrd_components_cpp
new file mode 100644
index 000000000..e604a63dd
--- /dev/null
+++ b/package/mrd6/patches/patch-src_linux_mrd_components_cpp
@@ -0,0 +1,14 @@
+--- mrd6-0.9.6.orig/src/linux/mrd_components.cpp 2007-01-07 03:11:27.000000000 +0100
++++ mrd6-0.9.6/src/linux/mrd_components.cpp 2009-06-19 21:49:44.000000000 +0200
+@@ -90,10 +90,8 @@ char *mrd::obtain_frame_description(void
+
+ void *mrd::posix_uctx::get_current_frame() const {
+ #if defined(__GLIBC__)
+-#if defined(__i386__)
++#if defined(__i386__)
+ return (void *)base->uc_mcontext.gregs[REG_EIP];
+-#elif defined(__mips__)
+- return (void *)base->uc_mcontext.gpregs[CTX_EPC];
+ #endif
+ #endif
+ return 0;
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index ca8d995b4..142570f14 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -92,7 +92,7 @@ do-build:
CC="$(TARGET_CC)" \
OS="linux" \
ARCH="$(ARCH)" \
- CFLAGS="$(TARGET_CFLAGS)" \
+ CFLAGS="$(TARGET_CFLAGS) -fPIC" \
LOCALBASE="$(STAGING_DIR)/usr" \
SYSBASE="$(STAGING_DIR)/usr" \
all modules
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 6b8b720a4..0e680b4ea 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,OPROFILE,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
TLDFLAGS+= -shared
+TCFLAGS+= -fPIC
+TCXXFLAGS+= -fPIC
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-kernel-support --with-linux=${LINUX_DIR}
BUILD_STYLE= auto
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index a1864a135..d6ffd9404 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -29,6 +29,7 @@ else
MAKE_FLAGS+= NO_TCP_WRAPPER=1
endif
TCPPFLAGS+= -DDAEMON_UID=20 -DDAEMON_GID=20
+TCFLAGS+= -fPIC
BUILD_STYLE:= auto
MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} \
CFLAGS='${TCFLAGS}'
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index b4c0df6db..fe16bdd2c 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -29,10 +29,10 @@ $(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL},${PKG_DESCR},${PKG_SECTION}))
ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
-PKG_CFLAGS=-fno-builtin -fno-rtti -nostdinc++
+PKG_FLAGS=-fno-builtin -fno-rtti -nostdinc++ -fPIC
PKG_LDFLAGS=-nodefaultlibs -luClibc++ -lc -lm
else
-PKG_CFLAGS=
+PKG_FLAGS=-fPIC
PKG_LDFLAGS=-shared
endif
diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
index 58e0fa6bf..19df602aa 100644
--- a/package/rtorrent/Config.in
+++ b/package/rtorrent/Config.in
@@ -2,9 +2,6 @@ config ADK_PACKAGE_RTORRENT
prompt "rtorrent........................... console bittorrent client"
tristate
depends on ADK_CXX
- # libtorrent / rtorrent does not work with uclibc++
- # with gcc 4.4 libstdc++ needs TLS in uClibc
- depends on ADK_TARGET_LIB_GLIBC
select ADK_PACKAGE_LIBNCURSES
select ADK_PACKAGE_LIBTORRENT
select ADK_PACKAGE_LIBCURL
@@ -16,17 +13,10 @@ choice
prompt "C++ library to use"
depends on ADK_PACKAGE_RTORRENT
default ADK_COMPILE_RTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
-default ADK_COMPILE_RTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
config ADK_COMPILE_RTORRENT_WITH_STDCXX
bool "Standard C++ library"
select ADK_PACKAGE_LIBSTDCXX
help
-config ADK_COMPILE_RTORRENT_WITH_UCLIBCXX
- bool "Embedded uClibc++ library"
- select ADK_PACKAGE_UCLIBCXX
- depends ADK_BROKEN
- help
-
endchoice
diff --git a/package/sane-backends/patches/patch-configure_in b/package/sane-backends/patches/patch-configure_in
new file mode 100644
index 000000000..48e14d989
--- /dev/null
+++ b/package/sane-backends/patches/patch-configure_in
@@ -0,0 +1,11 @@
+--- sane-backends-1.0.20.orig/configure.in 2009-05-03 03:25:23.000000000 +0200
++++ sane-backends-1.0.20/configure.in 2009-06-19 23:27:39.000000000 +0200
+@@ -513,7 +513,7 @@ ALL_BACKENDS="abaton agfafocus apple art
+ hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+ matsushita microtek microtek2 mustek mustek_pp \
+ mustek_usb mustek_usb2 nec net niash pie pint \
+- pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
++ pixma plustek plustek_pp ricoh rts8891 s9036 \
+ sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
+ stv680 tamarack teco1 teco2 teco3 test u12 umax
+ umax_pp umax1220u v4l xerox_mfp"
diff --git a/package/squid/patches/patch-src_HttpHeaderTools_cc b/package/squid/patches/patch-src_HttpHeaderTools_cc
new file mode 100644
index 000000000..3b456ebf5
--- /dev/null
+++ b/package/squid/patches/patch-src_HttpHeaderTools_cc
@@ -0,0 +1,11 @@
+--- squid-3.0.STABLE15.orig/src/HttpHeaderTools.cc 2009-05-06 13:11:40.000000000 +0200
++++ squid-3.0.STABLE15/src/HttpHeaderTools.cc 2009-06-15 18:29:41.000000000 +0200
+@@ -356,7 +356,7 @@ httpHeaderParseQuotedString (const char
+ pos = start + 1;
+
+ while (1) {
+- if (!(end = index (pos,'"'))) {
++ if (!(end = strchr (pos,'"'))) {
+ debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
+ return 0;
+ }
diff --git a/package/uclibc++/files/config b/package/uclibc++/files/config
index f6ef07573..2831ccc8e 100644
--- a/package/uclibc++/files/config
+++ b/package/uclibc++/files/config
@@ -15,7 +15,7 @@ HAVE_DOT_CONFIG=y
#
# String and I/O Stream Support
#
-UCLIBCXX_HAS_WCHAR=y
+# UCLIBCXX_HAS_WCHAR is not set
UCLIBCXX_IOSTREAM_BUFSIZE=32
UCLIBCXX_HAS_LFS=y
UCLIBCXX_SUPPORT_CDIR=y
@@ -23,10 +23,6 @@ UCLIBCXX_SUPPORT_CIN=y
UCLIBCXX_SUPPORT_COUT=y
UCLIBCXX_SUPPORT_CERR=y
# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
#
# STL and Code Expansion
@@ -51,7 +47,7 @@ UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
+# IMPORT_LIBSUP is not set
# IMPORT_LIBGCC_EH is not set
# BUILD_STATIC_LIB is not set
# DODEBUG is not set
diff --git a/package/uclibc++/files/config.mips b/package/uclibc++/files/config.mips
deleted file mode 100644
index f6ef07573..000000000
--- a/package/uclibc++/files/config.mips
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Features and Options
-#
-UCLIBCXX_HAS_FLOATS=y
-# UCLIBCXX_HAS_LONG_DOUBLE is not set
-# UCLIBCXX_HAS_TLS is not set
-WARNINGS="-Wall"
-BUILD_EXTRA_LIBRARIES=""
-HAVE_DOT_CONFIG=y
-
-#
-# String and I/O Stream Support
-#
-UCLIBCXX_HAS_WCHAR=y
-UCLIBCXX_IOSTREAM_BUFSIZE=32
-UCLIBCXX_HAS_LFS=y
-UCLIBCXX_SUPPORT_CDIR=y
-UCLIBCXX_SUPPORT_CIN=y
-UCLIBCXX_SUPPORT_COUT=y
-UCLIBCXX_SUPPORT_CERR=y
-# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
-
-#
-# STL and Code Expansion
-#
-UCLIBCXX_STL_BUFFER_SIZE=32
-UCLIBCXX_CODE_EXPANSION=y
-# UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS is not set
-UCLIBCXX_EXPAND_STRING_CHAR=y
-UCLIBCXX_EXPAND_VECTOR_BASIC=y
-# UCLIBCXX_EXPAND_IOS_CHAR is not set
-# UCLIBCXX_EXPAND_STREAMBUF_CHAR is not set
-UCLIBCXX_EXPAND_ISTREAM_CHAR=y
-UCLIBCXX_EXPAND_OSTREAM_CHAR=y
-UCLIBCXX_EXPAND_FSTREAM_CHAR=y
-# UCLIBCXX_EXPAND_SSTREAM_CHAR is not set
-
-#
-# Library Installation Options
-#
-UCLIBCXX_RUNTIME_PREFIX=""
-UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
-UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
-UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
-UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
-# IMPORT_LIBGCC_EH is not set
-# BUILD_STATIC_LIB is not set
-# DODEBUG is not set
diff --git a/package/uclibc++/files/config.x86 b/package/uclibc++/files/config.x86
deleted file mode 100644
index f6ef07573..000000000
--- a/package/uclibc++/files/config.x86
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Target Features and Options
-#
-UCLIBCXX_HAS_FLOATS=y
-# UCLIBCXX_HAS_LONG_DOUBLE is not set
-# UCLIBCXX_HAS_TLS is not set
-WARNINGS="-Wall"
-BUILD_EXTRA_LIBRARIES=""
-HAVE_DOT_CONFIG=y
-
-#
-# String and I/O Stream Support
-#
-UCLIBCXX_HAS_WCHAR=y
-UCLIBCXX_IOSTREAM_BUFSIZE=32
-UCLIBCXX_HAS_LFS=y
-UCLIBCXX_SUPPORT_CDIR=y
-UCLIBCXX_SUPPORT_CIN=y
-UCLIBCXX_SUPPORT_COUT=y
-UCLIBCXX_SUPPORT_CERR=y
-# UCLIBCXX_SUPPORT_CLOG is not set
-# UCLIBCXX_SUPPORT_WCIN is not set
-# UCLIBCXX_SUPPORT_WCOUT is not set
-# UCLIBCXX_SUPPORT_WCERR is not set
-# UCLIBCXX_SUPPORT_WCLOG is not set
-
-#
-# STL and Code Expansion
-#
-UCLIBCXX_STL_BUFFER_SIZE=32
-UCLIBCXX_CODE_EXPANSION=y
-# UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS is not set
-UCLIBCXX_EXPAND_STRING_CHAR=y
-UCLIBCXX_EXPAND_VECTOR_BASIC=y
-# UCLIBCXX_EXPAND_IOS_CHAR is not set
-# UCLIBCXX_EXPAND_STREAMBUF_CHAR is not set
-UCLIBCXX_EXPAND_ISTREAM_CHAR=y
-UCLIBCXX_EXPAND_OSTREAM_CHAR=y
-UCLIBCXX_EXPAND_FSTREAM_CHAR=y
-# UCLIBCXX_EXPAND_SSTREAM_CHAR is not set
-
-#
-# Library Installation Options
-#
-UCLIBCXX_RUNTIME_PREFIX=""
-UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include"
-UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib"
-UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin"
-UCLIBCXX_EXCEPTION_SUPPORT=y
-IMPORT_LIBSUP=y
-# IMPORT_LIBGCC_EH is not set
-# BUILD_STATIC_LIB is not set
-# DODEBUG is not set
diff --git a/package/udev/Config.in b/package/udev/Config.in
index b3f01cb65..012732efd 100644
--- a/package/udev/Config.in
+++ b/package/udev/Config.in
@@ -2,7 +2,7 @@ config ADK_PACKAGE_UDEV
prompt "udev.............................. Dynamic device management subsystem"
tristate
default n
- select ADK_COMPILE_UTIL_LINUX
+ select ADK_COMPILE_UTIL_LINUX_NG
help
udev provides a dynamic device directory containing only the files for
actually present devices. It creates or removes device node files in
diff --git a/package/util-linux/Config.in b/package/util-linux-ng/Config.in
index 2de091d4c..705c3cbff 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux-ng/Config.in
@@ -1,4 +1,4 @@
-config ADK_COMPILE_UTIL_LINUX
+config ADK_COMPILE_UTIL_LINUX_NG
tristate
default n
depends ADK_PACKAGE_FDISK || ADK_PACKAGE_SWAP_UTILS
@@ -7,32 +7,26 @@ config ADK_PACKAGE_FDISK
prompt "fdisk............................. Partition table manipulation utility"
tristate
default n
- select ADK_COMPILE_UTIL_LINUX
+ select ADK_COMPILE_UTIL_LINUX_NG
help
A partition table manipulation utility
- http://www.kernel.org/pub/linux/utils/util-linux/
-
config ADK_PACKAGE_LOSETUP
prompt "losetup........................... Loop devices setup and control utility"
tristate
default n
- select ADK_COMPILE_UTIL_LINUX
+ select ADK_COMPILE_UTIL_LINUX_NG
select ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
help
A loop devices setup and control utility
- http://www.kernel.org/pub/linux/utils/util-linux/
-
config ADK_PACKAGE_SWAP_UTILS
prompt "swap-utils........................ Swap space management utilities"
tristate
default n
- select ADK_COMPILE_UTIL_LINUX
+ select ADK_COMPILE_UTIL_LINUX_NG
help
A collection of tools to manage swap space :
* mkswap
* swapon
* swapoff
-
- http://www.kernel.org/pub/linux/utils/util-linux/
diff --git a/package/util-linux/Makefile b/package/util-linux-ng/Makefile
index ccf9e2677..397fdd572 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -3,13 +3,14 @@
include ${TOPDIR}/rules.mk
-PKG_NAME:= util-linux
-PKG_VERSION:= 2.12r
+PKG_NAME:= util-linux-ng
+PKG_VERSION:= 2.15
PKG_RELEASE:= 1
-PKG_MD5SUM:= c261230b27fc0fbcc287c76884caf2d3
+PKG_MD5SUM:= 18c9f263a44db67a73c12caf49b03e22
PKG_DESCR:= Linux utilities
PKG_SECTION:= admin
-PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux/}
+PKG_URL:= http://userweb.kernel.org/~kzak/util-linux-ng
+PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/util-linux-ng/v2.15/}
PKG_DESCR_1:= Partition table manipulation utility
PKG_DESCR_2:= Swap space management utilities
diff --git a/package/util-linux-ng/patches/patch-fdisk_cfdisk_c b/package/util-linux-ng/patches/patch-fdisk_cfdisk_c
new file mode 100644
index 000000000..8e5678d71
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-fdisk_cfdisk_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/fdisk/cfdisk.c 2009-05-05 21:16:45.000000000 +0200
++++ util-linux-ng-2.15/fdisk/cfdisk.c 2009-06-22 22:42:23.000000000 +0200
+@@ -357,7 +357,7 @@ xmalloc (size_t size) {
+ /* Some libc's have their own basename() */
+ static char *
+ my_basename(char *devname) {
+- char *s = rindex(devname, '/');
++ char *s = strrchr(devname, '/');
+ return s ? s+1 : devname;
+ }
+
diff --git a/package/util-linux/patches/patch-fdisk_fdiskbsdlabel_c b/package/util-linux-ng/patches/patch-fdisk_fdiskbsdlabel_c
index 7c57b9e40..f54a530dd 100644
--- a/package/util-linux/patches/patch-fdisk_fdiskbsdlabel_c
+++ b/package/util-linux-ng/patches/patch-fdisk_fdiskbsdlabel_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c 2003-07-13 23:12:47.000000000 +0200
-+++ util-linux-2.12r/fdisk/fdiskbsdlabel.c 2008-10-16 12:28:32.000000000 +0200
+--- util-linux-ng-2.15.orig/fdisk/fdiskbsdlabel.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/fdisk/fdiskbsdlabel.c 2009-06-22 22:42:04.000000000 +0200
@@ -538,10 +538,10 @@ xbsd_write_bootstrap (void)
/* We need a backup of the disklabel (xbsd_dlabel might have changed). */
@@ -10,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
/* The disklabel will be overwritten by 0's from bootxx anyway */
- bzero (d, sizeof (struct xbsd_disklabel));
-+ memset (d, 0 ,sizeof (struct xbsd_disklabel));
++ memset (d, 0, sizeof (struct xbsd_disklabel));
snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename);
if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize],
diff --git a/package/util-linux-ng/patches/patch-fdisk_sfdisk_c b/package/util-linux-ng/patches/patch-fdisk_sfdisk_c
new file mode 100644
index 000000000..a4778b60c
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-fdisk_sfdisk_c
@@ -0,0 +1,35 @@
+--- util-linux-ng-2.15.orig/fdisk/sfdisk.c 2009-05-05 21:16:46.000000000 +0200
++++ util-linux-ng-2.15/fdisk/sfdisk.c 2009-06-22 22:41:09.000000000 +0200
+@@ -1725,12 +1725,12 @@ read_stdin(char **fields, char *line, in
+ eof = 1;
+ return RD_EOF;
+ }
+- if (!(lp = index(lp, '\n')))
++ if (!(lp = strchr(lp, '\n')))
+ fatal(_("long or incomplete input line - quitting\n"));
+ *lp = 0;
+
+ /* remove comments, if any */
+- if ((lp = index(line+2, '#')) != 0)
++ if ((lp = strchr(line+2, '#')) != 0)
+ *lp = 0;
+
+ /* recognize a few commands - to be expanded */
+@@ -1740,7 +1740,7 @@ read_stdin(char **fields, char *line, in
+ }
+
+ /* dump style? - then bad input is fatal */
+- if ((ip = index(line+2, ':')) != 0) {
++ if ((ip = strchr(line+2, ':')) != 0) {
+ struct dumpfld *d;
+
+ nxtfld:
+@@ -2503,7 +2503,7 @@ main(int argc, char **argv) {
+
+ if (argc < 1)
+ fatal(_("no command?\n"));
+- if ((progn = rindex(argv[0], '/')) == NULL)
++ if ((progn = strrchr(argv[0], '/')) == NULL)
+ progn = argv[0];
+ else
+ progn++;
diff --git a/package/util-linux-ng/patches/patch-login-utils_Makefile_in b/package/util-linux-ng/patches/patch-login-utils_Makefile_in
new file mode 100644
index 000000000..b25c3dca4
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-login-utils_Makefile_in
@@ -0,0 +1,13 @@
+--- util-linux-ng-2.15.orig/login-utils/Makefile.in 2009-05-05 23:21:34.000000000 +0200
++++ util-linux-ng-2.15/login-utils/Makefile.in 2009-06-22 23:05:58.000000000 +0200
+@@ -1164,10 +1164,6 @@ $(ul_libblkid_la):
+ @BUILD_LOGIN_UTILS_TRUE@install-exec-hook::
+ @BUILD_LOGIN_UTILS_TRUE@ cd $(DESTDIR)$(usrsbinexecdir) && ln -sf vipw vigr
+
+-@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@install-exec-hook::
+-@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@ chgrp tty $(DESTDIR)$(usrbinexecdir)/wall
+-@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@ chmod g+s $(DESTDIR)$(usrbinexecdir)/wall
+-
+ @BUILD_INIT_TRUE@install-exec-hook::
+ @BUILD_INIT_TRUE@ cd $(DESTDIR)$(sbindir) && ln -sf shutdown reboot
+ @BUILD_INIT_TRUE@ cd $(DESTDIR)$(sbindir) && ln -sf shutdown fastboot
diff --git a/package/util-linux-ng/patches/patch-login-utils_ttymsg_c b/package/util-linux-ng/patches/patch-login-utils_ttymsg_c
new file mode 100644
index 000000000..ba78aa01b
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-login-utils_ttymsg_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/login-utils/ttymsg.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/login-utils/ttymsg.c 2009-06-22 22:44:07.000000000 +0200
+@@ -111,7 +111,7 @@ ttymsg(struct iovec *iov, int iovcnt, ch
+ if (wret >= 0) {
+ left -= wret;
+ if (iov != localiov) {
+- bcopy(iov, localiov,
++ memcpy(localiov, iov,
+ iovcnt * sizeof(struct iovec));
+ iov = localiov;
+ }
diff --git a/package/util-linux-ng/patches/patch-login-utils_wall_c b/package/util-linux-ng/patches/patch-login-utils_wall_c
new file mode 100644
index 000000000..b30da5c65
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-login-utils_wall_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/login-utils/wall.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/login-utils/wall.c 2009-06-22 22:43:36.000000000 +0200
+@@ -95,7 +95,7 @@ main(int argc, char **argv) {
+ textdomain(PACKAGE);
+
+ progname = argv[0];
+- p = rindex(progname, '/');
++ p = strrchr(progname, '/');
+ if (p)
+ progname = p+1;
+
diff --git a/package/util-linux-ng/patches/patch-misc-utils_cal_c b/package/util-linux-ng/patches/patch-misc-utils_cal_c
new file mode 100644
index 000000000..0f8df6815
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-misc-utils_cal_c
@@ -0,0 +1,18 @@
+--- util-linux-ng-2.15.orig/misc-utils/cal.c 2009-03-25 13:20:18.000000000 +0100
++++ util-linux-ng-2.15/misc-utils/cal.c 2009-06-22 22:49:19.000000000 +0200
+@@ -291,6 +291,7 @@ main(int argc, char **argv) {
+ * the locale database, which can be overridden with the
+ * -s (Sunday) or -m (Monday) options.
+ */
++#if 0
+ #ifdef HAVE_LANGINFO_H
+ /*
+ * You need to use 2 locale variables to get the first day of the week.
+@@ -315,6 +316,7 @@ main(int argc, char **argv) {
+ weekstart = (wfd + *nl_langinfo(_NL_TIME_FIRST_WEEKDAY) - 1) % 7;
+ }
+ #endif
++#endif
+
+ yflag = 0;
+ while ((ch = getopt(argc, argv, "13mjsyV")) != -1)
diff --git a/package/util-linux-ng/patches/patch-misc-utils_logger_c b/package/util-linux-ng/patches/patch-misc-utils_logger_c
new file mode 100644
index 000000000..6a65e3ac3
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-misc-utils_logger_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/misc-utils/logger.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/misc-utils/logger.c 2009-06-22 22:50:36.000000000 +0200
+@@ -196,7 +196,7 @@ main(int argc, char **argv) {
+ } else {
+ if (p != buf)
+ *p++ = ' ';
+- bcopy(*argv++, p, len);
++ memcpy(p, *argv++, len);
+ *(p += len) = '\0';
+ }
+ }
diff --git a/package/util-linux-ng/patches/patch-misc-utils_whereis_c b/package/util-linux-ng/patches/patch-misc-utils_whereis_c
new file mode 100644
index 000000000..6e6edcee5
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-misc-utils_whereis_c
@@ -0,0 +1,19 @@
+--- util-linux-ng-2.15.orig/misc-utils/whereis.c 2009-03-25 13:19:08.000000000 +0100
++++ util-linux-ng-2.15/misc-utils/whereis.c 2009-06-22 22:51:39.000000000 +0200
+@@ -325,14 +325,14 @@ findin(char *dir, char *cp) {
+ char dirbuf[1024];
+ struct stat statbuf;
+
+- dd = index(dir, '*');
++ dd = strchr(dir, '*');
+ if (!dd)
+ goto noglob;
+
+ l = strlen(dir);
+ if (l < sizeof(dirbuf)) { /* refuse excessively long names */
+ strcpy (dirbuf, dir);
+- d = index(dirbuf, '*');
++ d = strchr(dirbuf, '*');
+ *d = 0;
+ dirp = opendir(dirbuf);
+ if (dirp == NULL)
diff --git a/package/util-linux/patches/patch-mount_mount_c b/package/util-linux-ng/patches/patch-mount_mount_c
index 8ffdf8ee0..7335765f2 100644
--- a/package/util-linux/patches/patch-mount_mount_c
+++ b/package/util-linux-ng/patches/patch-mount_mount_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/mount.c 2004-12-21 23:00:36.000000000 +0100
-+++ util-linux-2.12r/mount/mount.c 2008-10-16 12:00:29.000000000 +0200
-@@ -488,11 +488,11 @@ guess_fstype_and_mount(const char *spec,
+--- util-linux-ng-2.15.orig/mount/mount.c 2009-03-27 13:13:20.000000000 +0100
++++ util-linux-ng-2.15/mount/mount.c 2009-06-22 22:58:48.000000000 +0200
+@@ -914,11 +914,11 @@ guess_fstype_and_mount(const char *spec,
/* Accept a comma-separated list of types, and try them one by one */
/* A list like "nonfs,.." indicates types not to use */
@@ -14,4 +13,4 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+ while((p = strchr(t,',')) != NULL) {
*p = 0;
args.type = *types = t;
- if(do_mount_syscall (&args) == 0)
+ if (do_mount (&args, special, status) == 0)
diff --git a/package/util-linux-ng/patches/patch-mount_mount_mntent_c b/package/util-linux-ng/patches/patch-mount_mount_mntent_c
new file mode 100644
index 000000000..4e0f05735
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-mount_mount_mntent_c
@@ -0,0 +1,20 @@
+--- util-linux-ng-2.15.orig/mount/mount_mntent.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/mount/mount_mntent.c 2009-06-22 22:59:15.000000000 +0200
+@@ -157,7 +157,7 @@ my_getmntent (mntFILE *mfp) {
+ return NULL;
+
+ mfp->mntent_lineno++;
+- s = index (buf, '\n');
++ s = strchr (buf, '\n');
+ if (s == NULL) {
+ /* Missing final newline? Otherwise extremely */
+ /* long line - assume file was corrupted */
+@@ -165,7 +165,7 @@ my_getmntent (mntFILE *mfp) {
+ fprintf(stderr, _("[mntent]: warning: no final "
+ "newline at the end of %s\n"),
+ mfp->mntent_file);
+- s = index (buf, 0);
++ s = strchr (buf, 0);
+ } else {
+ mfp->mntent_errs = 1;
+ goto err;
diff --git a/package/util-linux-ng/patches/patch-mount_sundries_c b/package/util-linux-ng/patches/patch-mount_sundries_c
new file mode 100644
index 000000000..640b2e2aa
--- /dev/null
+++ b/package/util-linux-ng/patches/patch-mount_sundries_c
@@ -0,0 +1,11 @@
+--- util-linux-ng-2.15.orig/mount/sundries.c 2009-03-25 13:20:18.000000000 +0100
++++ util-linux-ng-2.15/mount/sundries.c 2009-06-22 22:59:31.000000000 +0200
+@@ -157,7 +157,7 @@ matching_type (const char *type, const c
+ if (strncmp(p, type, len) == 0 &&
+ (p[len] == 0 || p[len] == ','))
+ return !no;
+- p = index(p,',');
++ p = strchr(p,',');
+ if (!p)
+ break;
+ p++;
diff --git a/package/util-linux/patches/patch-text-utils_colcrt_c b/package/util-linux-ng/patches/patch-text-utils_colcrt_c
index 3e2b90e94..122e5b23e 100644
--- a/package/util-linux/patches/patch-text-utils_colcrt_c
+++ b/package/util-linux-ng/patches/patch-text-utils_colcrt_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/text-utils/colcrt.c 2001-03-15 11:09:59.000000000 +0100
-+++ util-linux-2.12r/text-utils/colcrt.c 2008-10-16 12:49:47.000000000 +0200
+--- util-linux-ng-2.15.orig/text-utils/colcrt.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/text-utils/colcrt.c 2009-06-22 22:53:15.000000000 +0200
@@ -252,8 +252,8 @@ void pflush(int ol)
}
putwchar('\n');
diff --git a/package/util-linux/patches/patch-text-utils_display_c b/package/util-linux-ng/patches/patch-text-utils_display_c
index f1b17a774..ecb8069ff 100644
--- a/package/util-linux/patches/patch-text-utils_display_c
+++ b/package/util-linux-ng/patches/patch-text-utils_display_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/text-utils/display.c 2002-03-09 00:05:39.000000000 +0100
-+++ util-linux-2.12r/text-utils/display.c 2008-10-16 12:52:48.000000000 +0200
+--- util-linux-ng-2.15.orig/text-utils/display.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/text-utils/display.c 2009-06-22 22:56:12.000000000 +0200
@@ -163,7 +163,7 @@ static void bpad(PR *pr)
pr->cchar[0] = 's';
pr->cchar[1] = 0;
diff --git a/package/util-linux/patches/patch-text-utils_parse_c b/package/util-linux-ng/patches/patch-text-utils_parse_c
index d94a81851..683e6f279 100644
--- a/package/util-linux/patches/patch-text-utils_parse_c
+++ b/package/util-linux-ng/patches/patch-text-utils_parse_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/text-utils/parse.c 2002-03-09 00:07:00.000000000 +0100
-+++ util-linux-2.12r/text-utils/parse.c 2008-10-16 12:51:11.000000000 +0200
+--- util-linux-ng-2.15.orig/text-utils/parse.c 2009-02-24 16:39:30.000000000 +0100
++++ util-linux-ng-2.15/text-utils/parse.c 2009-06-22 22:54:37.000000000 +0200
@@ -64,7 +64,7 @@ void addfile(char *name)
exit(1);
}
diff --git a/package/util-linux/patches/patch-MCONFIG b/package/util-linux/patches/patch-MCONFIG
deleted file mode 100644
index 494d2119c..000000000
--- a/package/util-linux/patches/patch-MCONFIG
+++ /dev/null
@@ -1,69 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/MCONFIG 2004-12-13 00:15:48.000000000 +0100
-+++ util-linux-2.12r/MCONFIG 2008-10-16 11:46:07.000000000 +0200
-@@ -16,8 +16,8 @@
- # Select for ARCH one of intel, alpha, sparc, arm, m68k, mips
- # Select for CPU i386 if the binaries must be able to run on an intel 386
- # (by default i486 code is generated, see below)
--CPU=$(shell uname -m)
--ARCH=$(shell echo $(CPU) | sed 's/i.86/intel/;s/arm.*/arm/')
-+CPU=
-+ARCH=
-
- # If HAVE_PAM is set to "yes", then login, chfn, chsh, and newgrp
- # will use PAM for authentication. Additionally, passwd will not be
-@@ -64,12 +64,12 @@ HAVE_SYSVINIT_UTILS=yes
- # If HAVE_WRITE is set to "yes", then write will not be built or
- # installed from the misc-utils subdirectory.
- # (There is a network aware write in netwrite from NetKit 0.16 or later.)
--HAVE_WRITE=no
-+HAVE_WRITE=yes
-
- # If HAVE_GETTY is set to "yes", then agetty will not be built or
- # installed from the login-utils subdirectory. Note that agetty can
- # co-exist with other gettys, so this option should never be used.
--HAVE_GETTY=no
-+HAVE_GETTY=yes
-
- # If USE_TTY_GROUP is set to "yes", then wall and write will be installed
- # setgid to the "tty" group, and mesg will only set the group write bit.
-@@ -82,13 +82,13 @@ USE_TTY_GROUP=yes
- # If HAVE_KILL is set to "yes", then kill will not be built or
- # installed from the misc-utils subdirectory.
- # (There is also a kill in the procps package.)
--HAVE_KILL=no
-+HAVE_KILL=yes
-
- # If ALLOW_VCS_USE is set to "yes", then login will chown /dev/vcsN
- # to the current user, allowing her to make a screendump and do other
- # nifty things on the console, but also allowing him to keep an open
- # file descriptor after logging out to trick the next user.
--ALLOW_VCS_USE=yes
-+ALLOW_VCS_USE=no
-
- # If DO_STAT_MAIL is set to "yes", then login will stat() the mailbox
- # and tell the user that she has new mail. This can hang the login if
-@@ -102,19 +102,19 @@ HAVE_RESET=yes
- # If HAVE_SLN is set to "yes", then sln won't be installed
- # (but the man page sln.8 will be installed anyway).
- # sln also comes with libc and glibc.
--HAVE_SLN=no
-+HAVE_SLN=yes
-
- # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
--HAVE_FDUTILS=no
-+HAVE_FDUTILS=yes
-
- # If SILENT_PG is set to "yes", then pg will not ring the bell
- # when an invalid key is pressed
--SILENT_PG=no
-+SILENT_PG=yes
-
- # If configure decides that Native Language Support (NLS) is available,
- # it sets MAY_ENABLE_NLS in defines.h. If you don't want NLS, set
- # DISABLE_NLS to "yes".
--DISABLE_NLS=no
-+DISABLE_NLS=yes
-
- # Different optimizations for different cpus.
- # Before gcc 2.8.0 only -m486
diff --git a/package/util-linux/patches/patch-disk-utils_fsck_cramfs_c b/package/util-linux/patches/patch-disk-utils_fsck_cramfs_c
deleted file mode 100644
index ad2a5f314..000000000
--- a/package/util-linux/patches/patch-disk-utils_fsck_cramfs_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/disk-utils/fsck.cramfs.c 2004-12-11 15:53:16.000000000 +0100
-+++ util-linux-2.12r/disk-utils/fsck.cramfs.c 2008-10-16 11:44:16.000000000 +0200
-@@ -76,7 +76,6 @@ static uid_t euid; /* effective UID */
-
- #define PAD_SIZE 512
-
--#include <asm/page.h>
- #ifdef PAGE_SIZE
- #define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
- #elif defined __ia64__
diff --git a/package/util-linux/patches/patch-fdisk_cfdisk_c b/package/util-linux/patches/patch-fdisk_cfdisk_c
deleted file mode 100644
index 7ae258710..000000000
--- a/package/util-linux/patches/patch-fdisk_cfdisk_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/cfdisk.c 2005-09-09 23:44:57.000000000 +0200
-+++ util-linux-2.12r/fdisk/cfdisk.c 2008-10-16 12:30:58.000000000 +0200
-@@ -353,7 +353,7 @@ xmalloc (size_t size) {
- /* Some libc's have their own basename() */
- static char *
- my_basename(char *devname) {
-- char *s = rindex(devname, '/');
-+ char *s = strrchr(devname, '/');
- return s ? s+1 : devname;
- }
-
diff --git a/package/util-linux/patches/patch-fdisk_llseek_c b/package/util-linux/patches/patch-fdisk_llseek_c
deleted file mode 100644
index a067c34e7..000000000
--- a/package/util-linux/patches/patch-fdisk_llseek_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/llseek.c 2003-07-13 23:13:33.000000000 +0200
-+++ util-linux-2.12r/fdisk/llseek.c 2008-10-16 12:30:16.000000000 +0200
-@@ -16,6 +16,7 @@ extern long long ext2_llseek (unsigned i
-
- #ifdef HAVE_LLSEEK
- #include <syscall.h>
-+#define my_llseek lseek
-
- #else /* HAVE_LLSEEK */
-
diff --git a/package/util-linux/patches/patch-fdisk_sfdisk_c b/package/util-linux/patches/patch-fdisk_sfdisk_c
deleted file mode 100644
index 02f0358fe..000000000
--- a/package/util-linux/patches/patch-fdisk_sfdisk_c
+++ /dev/null
@@ -1,68 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/sfdisk.c 2005-01-04 23:31:57.000000000 +0100
-+++ util-linux-2.12r/fdisk/sfdisk.c 2008-10-16 12:42:16.000000000 +0200
-@@ -171,16 +171,6 @@ fatal(char *s, ...) {
- *
- * Note: we use 512-byte sectors here, irrespective of the hardware ss.
- */
--#undef use_lseek
--#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__)
--#define use_lseek
--#endif
--
--#ifndef use_lseek
--static __attribute__used
--_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo,
-- loff_t *, res, unsigned int, wh);
--#endif
-
- static int
- sseek(char *dev, unsigned int fd, unsigned long s) {
-@@ -188,12 +178,8 @@ sseek(char *dev, unsigned int fd, unsign
- in = ((loff_t) s << 9);
- out = 1;
-
--#ifndef use_lseek
-- if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) {
--#else
-- if ((out = lseek(fd, in, SEEK_SET)) != in) {
--#endif
-- perror("llseek");
-+ if ((out = lseek64(fd, in, SEEK_SET)) != in) {
-+ perror("lseek64");
- error(_("seek error on %s - cannot seek to %lu\n"), dev, s);
- return 0;
- }
-@@ -1730,12 +1716,12 @@ read_stdin(unsigned char **fields, unsig
- eof = 1;
- return RD_EOF;
- }
-- if (!(lp = index(lp, '\n')))
-+ if (!(lp = strchr(lp, '\n')))
- fatal(_("long or incomplete input line - quitting\n"));
- *lp = 0;
-
- /* remove comments, if any */
-- if ((lp = index(line+2, '#')) != 0)
-+ if ((lp = strchr(line+2, '#')) != 0)
- *lp = 0;
-
- /* recognize a few commands - to be expanded */
-@@ -1745,7 +1731,7 @@ read_stdin(unsigned char **fields, unsig
- }
-
- /* dump style? - then bad input is fatal */
-- if ((ip = index(line+2, ':')) != 0) {
-+ if ((ip = strchr(line+2, ':')) != 0) {
- struct dumpfld *d;
-
- nxtfld:
-@@ -2514,7 +2500,7 @@ main(int argc, char **argv) {
-
- if (argc < 1)
- fatal(_("no command?\n"));
-- if ((progn = rindex(argv[0], '/')) == NULL)
-+ if ((progn = strrchr(argv[0], '/')) == NULL)
- progn = argv[0];
- else
- progn++;
diff --git a/package/util-linux/patches/patch-fdisk_sfdisk_c.orig b/package/util-linux/patches/patch-fdisk_sfdisk_c.orig
deleted file mode 100644
index 9b9560f00..000000000
--- a/package/util-linux/patches/patch-fdisk_sfdisk_c.orig
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/fdisk/sfdisk.c 2005-01-04 23:31:57.000000000 +0100
-+++ util-linux-2.12r/fdisk/sfdisk.c 2008-10-16 12:32:33.000000000 +0200
-@@ -2514,7 +2514,7 @@ main(int argc, char **argv) {
-
- if (argc < 1)
- fatal(_("no command?\n"));
-- if ((progn = rindex(argv[0], '/')) == NULL)
-+ if ((progn = strrchr(argv[0], '/')) == NULL)
- progn = argv[0];
- else
- progn++;
diff --git a/package/util-linux/patches/patch-misc-utils_logger_c b/package/util-linux/patches/patch-misc-utils_logger_c
deleted file mode 100644
index 59fba39b7..000000000
--- a/package/util-linux/patches/patch-misc-utils_logger_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/misc-utils/logger.c 2004-09-06 23:13:49.000000000 +0200
-+++ util-linux-2.12r/misc-utils/logger.c 2008-10-16 11:47:36.000000000 +0200
-@@ -198,7 +198,7 @@ main(int argc, char **argv) {
- } else {
- if (p != buf)
- *p++ = ' ';
-- bcopy(*argv++, p, len);
-+ memcpy(p, *argv++, len);
- *(p += len) = '\0';
- }
- }
diff --git a/package/util-linux/patches/patch-misc-utils_namei_c b/package/util-linux/patches/patch-misc-utils_namei_c
deleted file mode 100644
index 07945d906..000000000
--- a/package/util-linux/patches/patch-misc-utils_namei_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/misc-utils/namei.c 2004-12-23 00:03:39.000000000 +0100
-+++ util-linux-2.12r/misc-utils/namei.c 2008-10-16 11:48:55.000000000 +0200
-@@ -242,7 +242,7 @@ namei(char *file, int lev) {
- * call namei()
- */
-
-- bzero(sym, BUFSIZ);
-+ memset(sym, 0, BUFSIZ);
- if(readlink(buf, sym, BUFSIZ) == -1){
- (void)printf(_(" ? problems reading symlink %s - %s (%d)\n"), buf, ERR);
- return;
diff --git a/package/util-linux/patches/patch-misc-utils_whereis_c b/package/util-linux/patches/patch-misc-utils_whereis_c
deleted file mode 100644
index 4c1f25868..000000000
--- a/package/util-linux/patches/patch-misc-utils_whereis_c
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/misc-utils/whereis.c 2001-03-15 11:09:58.000000000 +0100
-+++ util-linux-2.12r/misc-utils/whereis.c 2008-10-16 11:50:03.000000000 +0200
-@@ -323,14 +323,14 @@ findin(char *dir, char *cp) {
- char dirbuf[1024];
- struct stat statbuf;
-
-- dd = index(dir, '*');
-+ dd = strchr(dir, '*');
- if (!dd)
- goto noglob;
-
- l = strlen(dir);
- if (l < sizeof(dirbuf)) { /* refuse excessively long names */
- strcpy (dirbuf, dir);
-- d = index(dirbuf, '*');
-+ d = strchr(dirbuf, '*');
- *d = 0;
- dirp = opendir(dirbuf);
- if (dirp == NULL)
diff --git a/package/util-linux/patches/patch-mount_mntent_c b/package/util-linux/patches/patch-mount_mntent_c
deleted file mode 100644
index 7445e1bf4..000000000
--- a/package/util-linux/patches/patch-mount_mntent_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/mntent.c 2004-10-13 22:57:34.000000000 +0200
-+++ util-linux-2.12r/mount/mntent.c 2008-10-16 12:00:45.000000000 +0200
-@@ -6,7 +6,7 @@
- */
-
- #include <stdio.h>
--#include <string.h> /* for index */
-+#include <string.h> /* for strchr */
- #include <ctype.h> /* for isdigit */
- #include <sys/stat.h> /* for umask */
- #include "mntent.h"
-@@ -158,7 +158,7 @@ my_getmntent (mntFILE *mfp) {
- return NULL;
-
- mfp->mntent_lineno++;
-- s = index (buf, '\n');
-+ s = strchr (buf, '\n');
- if (s == NULL) {
- /* Missing final newline? Otherwise extremely */
- /* long line - assume file was corrupted */
-@@ -166,7 +166,7 @@ my_getmntent (mntFILE *mfp) {
- fprintf(stderr, _("[mntent]: warning: no final "
- "newline at the end of %s\n"),
- mfp->mntent_file);
-- s = index (buf, 0);
-+ s = strchr (buf, 0);
- } else {
- mfp->mntent_errs = 1;
- goto err;
diff --git a/package/util-linux/patches/patch-mount_mount_by_label_c b/package/util-linux/patches/patch-mount_mount_by_label_c
deleted file mode 100644
index dd40fc7c4..000000000
--- a/package/util-linux/patches/patch-mount_mount_by_label_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/mount_by_label.c 2004-12-22 00:15:33.000000000 +0100
-+++ util-linux-2.12r/mount/mount_by_label.c 2008-10-16 12:01:50.000000000 +0200
-@@ -213,7 +213,7 @@ uuidcache_init(void) {
- fseek(procpt, 0, SEEK_SET);
-
- while (fgets(line, sizeof(line), procpt)) {
-- if (!index(line, '\n'))
-+ if (!strchr(line, '\n'))
- break;
-
- if (sscanf (line, " %d %d %d %[^\n ]",
diff --git a/package/util-linux/patches/patch-mount_sundries_c b/package/util-linux/patches/patch-mount_sundries_c
deleted file mode 100644
index 860b8c10b..000000000
--- a/package/util-linux/patches/patch-mount_sundries_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/sundries.c 2004-12-21 20:12:31.000000000 +0100
-+++ util-linux-2.12r/mount/sundries.c 2008-10-16 12:00:59.000000000 +0200
-@@ -138,7 +138,7 @@ matching_type (const char *type, const c
- if (strncmp(p, type, len) == 0 &&
- (p[len] == 0 || p[len] == ','))
- return !no;
-- p = index(p,',');
-+ p = strchr(p,',');
- if (!p)
- break;
- p++;
diff --git a/package/util-linux/patches/patch-mount_umount_c b/package/util-linux/patches/patch-mount_umount_c
deleted file mode 100644
index ee0eb3920..000000000
--- a/package/util-linux/patches/patch-mount_umount_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- util-linux-2.12r.orig/mount/umount.c 2005-09-10 20:07:38.000000000 +0200
-+++ util-linux-2.12r/mount/umount.c 2008-10-16 12:02:22.000000000 +0200
-@@ -338,7 +338,7 @@ umount_one (const char *spec, const char
- if (res < 0)
- umnt_err2 = errno;
- /* Do not complain about remote NFS mount points */
-- if (errno == ENOENT && index(spec, ':'))
-+ if (errno == ENOENT && strchr(spec, ':'))
- umnt_err2 = 0;
- }
- }
diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in
index f9b7e51da..dbb743a1c 100644
--- a/package/valgrind/Config.in
+++ b/package/valgrind/Config.in
@@ -2,5 +2,7 @@ config ADK_PACKAGE_VALGRIND
prompt "valgrind.......................... a memory error detector and more"
tristate
default n
+ depends on ADK_LINUX_X86_ALIX1C || \
+ ADK_LINUX_X86_QEMU
help
http://valgrind.org/
diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in
index d809a8570..ca59cab42 100644
--- a/package/xf86-video-geode/Config.in
+++ b/package/xf86-video-geode/Config.in
@@ -2,6 +2,7 @@ config ADK_PACKAGE_XF86_VIDEO_GEODE
prompt "xf86-video-geode........................... X11 driver for AMD Geode"
tristate
default n
+ depends on ADK_LINUX_X86_ALIX1C
select ADK_PACKAGE_XORG_SERVER
help
http://www.x.org