summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Makefile.in4
-rw-r--r--package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch12
-rw-r--r--package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch12
-rw-r--r--package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch12
-rw-r--r--package/games/prboom/prboom-2.5.0-libpng-1.4.patch32
-rw-r--r--package/games/prboom/prboom.mk14
-rw-r--r--package/haserl/Config.in2
-rw-r--r--package/hostapd/Config.in8
-rw-r--r--package/hostapd/hostapd.mk86
-rw-r--r--package/mtd/mtd.mk2
-rw-r--r--package/multimedia/alsa-lib/alsa-lib.mk2
-rw-r--r--package/netsnmp/netsnmp.mk5
-rw-r--r--package/ng-spice-rework/Config.in1
-rw-r--r--package/openssl/openssl-nofips.patch12
-rw-r--r--package/openssl/openssl-optional-ipv6.patch55
-rw-r--r--package/openssl/openssl-uclibc-susv3-legacy.patch18
-rw-r--r--package/openssl/openssl.mk21
-rw-r--r--package/pppd/Config.in6
-rw-r--r--package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch24
-rw-r--r--package/pppd/pppd.mk77
-rw-r--r--package/startup-notification/startup-notification.mk3
-rw-r--r--package/torsmo/torsmo.mk2
-rw-r--r--package/vsftpd/vsftpd.mk5
-rw-r--r--package/wpa_supplicant/Config.in11
-rw-r--r--package/wpa_supplicant/wpa_supplicant.mk38
-rw-r--r--package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk2
-rw-r--r--package/x11r7/xapp_xinput/Config.in1
-rw-r--r--package/x11r7/xapp_xinput/xapp_xinput.mk2
-rw-r--r--package/x11r7/xapp_xmore/Config.in2
-rw-r--r--package/x11r7/xapp_xmore/xapp_xmore.mk2
30 files changed, 281 insertions, 192 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 85e655054..fb09083de 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -116,7 +116,11 @@ TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
+ifneq ($(TOOLCHAIN_EXTERNAL_PATH),)
TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
+else
+TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PREFIX)-
+endif
else ifeq ($(BR2_TOOLCHAIN_CTNG),y)
TARGET_CROSS=$(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-
endif
diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch
new file mode 100644
index 000000000..b135c1463
--- /dev/null
+++ b/package/busybox/busybox-1.17.3/busybox-1.17.3-dnsd.patch
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c
+--- busybox-1.17.3/networking/dnsd.c 2010-10-09 21:57:14.000000000 +0200
++++ busybox-1.17.3-dnsd/networking/dnsd.c 2010-10-29 00:37:43.066043841 +0200
+@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent
+ query_len = strlen(query_string) + 1;
+ /* may be unaligned! */
+ unaligned_type_class = (void *)(query_string + query_len);
+- query_len += sizeof(unaligned_type_class);
++ query_len += sizeof(*unaligned_type_class);
+ /* where to append answer block */
+ answb = (void *)(unaligned_type_class + 1);
+
diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch
new file mode 100644
index 000000000..ebc9bf9f9
--- /dev/null
+++ b/package/busybox/busybox-1.17.3/busybox-1.17.3-sort.patch
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c
+--- busybox-1.17.3/coreutils/sort.c 2010-10-09 21:57:13.000000000 +0200
++++ busybox-1.17.3-sort/coreutils/sort.c 2010-10-20 15:17:35.320293543 +0200
+@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha
+ #if ENABLE_FEATURE_SORT_BIG
+ /* Open output file _after_ we read all input ones */
+ if (option_mask32 & FLAG_o)
+- xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
++ xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO);
+ #endif
+ flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
+ for (i = 0; i < linecount; i++)
diff --git a/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch b/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch
new file mode 100644
index 000000000..dc3b02e22
--- /dev/null
+++ b/package/busybox/busybox-1.17.3/busybox-1.17.3-unicode.patch
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c
+--- busybox-1.17.3/libbb/unicode.c 2010-10-09 21:58:13.000000000 +0200
++++ busybox-1.17.3-unicode/libbb/unicode.c 2010-10-29 00:48:36.951494079 +0200
+@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p
+ }
+ }
+ if (stats)
+- stats->byte_count = stats->unicode_count = (d - dst);
++ stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
+ return dst;
+ }
+
diff --git a/package/games/prboom/prboom-2.5.0-libpng-1.4.patch b/package/games/prboom/prboom-2.5.0-libpng-1.4.patch
new file mode 100644
index 000000000..0d2a3a5ba
--- /dev/null
+++ b/package/games/prboom/prboom-2.5.0-libpng-1.4.patch
@@ -0,0 +1,32 @@
+[PATCH] fix build with libpng 1.4.x
+
+In 1.4.x the png_*_NULL defines are gone. Replace them with a normal
+NULL instead.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/SDL/i_sshot.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: prboom-2.5.0/src/SDL/i_sshot.c
+===================================================================
+--- prboom-2.5.0.orig/src/SDL/i_sshot.c
++++ prboom-2.5.0/src/SDL/i_sshot.c
+@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname)
+ if (fp)
+ {
+ png_struct *png_ptr = png_create_write_struct(
+- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
+
+ if (png_ptr)
+ {
+@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname)
+ break;
+ }
+ }
+- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++ png_destroy_write_struct(&png_ptr, NULL);
+ }
+ fclose(fp);
+ }
diff --git a/package/games/prboom/prboom.mk b/package/games/prboom/prboom.mk
index 228c78886..3a50fd502 100644
--- a/package/games/prboom/prboom.mk
+++ b/package/games/prboom/prboom.mk
@@ -3,20 +3,26 @@
# PrBoom
#
#############################################################
-PRBOOM_VERSION = 2.4.7
+PRBOOM_VERSION = 2.5.0
+PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
PRBOOM_DEPENDENCIES = sdl SDL_net sdl_mixer
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+PRBOOM_DEPENDENCIES += libpng
+endif
+
PRBOOM_CONF_OPT = \
--oldincludedir=$(STAGING_DIR)/usr/include \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
--disable-cpu-opt \
--disable-sdltest \
- --disable-gl \
- --without-x
+ --disable-gl
+# endianness detection isn't used when cross compiling
define PRBOOM_BIG_ENDIAN_FIXUP
- $(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' $(PRBOOM_DIR)/config.h
+ $(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' \
+ $(PRBOOM_DIR)/config.h
endef
ifeq ($(BR2_ENDIAN),"BIG")
diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index a8d2ee5a8..23101c43f 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -38,4 +38,4 @@ endchoice
config BR2_PACKAGE_HASERL_VERSION
string
default "0.8.0" if BR2_PACKAGE_HASERL_VERSION_0_8_X
- default "0.9.26" if BR2_PACKAGE_HASERL_VERSION_0_9_X
+ default "0.9.27" if BR2_PACKAGE_HASERL_VERSION_0_9_X
diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index 133796e20..376a087b4 100644
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -10,16 +10,14 @@ config BR2_PACKAGE_HOSTAPD
http://hostap.epitest.fi/
-config BR2_PACKAGE_HOSTAPD_EXTRA_EAP
- bool "Enable EAP TLS/TTLS/MSCHAPv2/PEAP"
+config BR2_PACKAGE_HOSTAPD_EAP
+ bool "Enable EAP"
depends on BR2_PACKAGE_HOSTAPD
- select BR2_PACKAGE_OPENSSL
help
- Enable support for extra EAP methods TLS, TTLS, MSCHAPv2 and PEAP.
+ Enable support for EAP and RADIUS.
config BR2_PACKAGE_HOSTAPD_WPS
bool "Enable WPS"
depends on BR2_PACKAGE_HOSTAPD
- select BR2_PACKAGE_OPENSSL
help
Enable support for Wi-Fi Protected Setup.
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 4065d7b66..27689b8fc 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -1,46 +1,66 @@
-#############################################################
+##############################################################
#
# hostapd
#
#############################################################
-HOSTAPD_VERSION = 0.7.2
+HOSTAPD_VERSION = 0.7.3
HOSTAPD_SITE = http://hostap.epitest.fi/releases
HOSTAPD_SUBDIR = hostapd
HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
HOSTAPD_DEPENDENCIES = libnl
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
- HOSTAPD_DEPENDENCIES += openssl
- # OpenSSL is required for EXTRA_EAP and/or WPS
- # We take care of that in Config.in
-else
-define HOSTAPD_OPENSSL_CONF
+define HOSTAPD_CRYPTO_CONFIG
echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG)
echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(HOSTAPD_CONFIG)
endef
-endif
-ifneq ($(BR2_INET_IPV6),y)
-define HOSTAPD_IPV6_CONF
- $(SED) "s/CONFIG_IPV6=y//" $(HOSTAPD_CONFIG)
+# Try to use openssl for TLS if it's already available
+# gnutls is also supported for TLS
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ HOSTAPD_DEPENDENCIES += openssl
+define HOSTAPD_TLS_CONFIG
+ echo "CONFIG_TLS=openssl" >>$(HOSTAPD_CONFIG)
+endef
+else
+define HOSTAPD_TLS_CONFIG
+ echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG)
endef
endif
-ifneq ($(BR2_PACKAGE_HOSTAPD_EXTRA_EAP),y)
-define HOSTAPD_EXTRA_EAP_CONF
+ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
+define HOSTAPD_EAP_CONFIG
$(SED) "s/CONFIG_EAP_MSCHAPV2=y//" $(HOSTAPD_CONFIG)
$(SED) "s/CONFIG_EAP_PEAP=y//" $(HOSTAPD_CONFIG)
$(SED) "s/CONFIG_EAP_TLS=y//" $(HOSTAPD_CONFIG)
$(SED) "s/CONFIG_EAP_TTLS=y//" $(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG)
+ echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG)
+endef
+ifeq ($(BR2_INET_IPV6),y)
+define HOSTAPD_RADIUS_IPV6_CONFIG
+ $(SED) "s/^#CONFIG_IPV6/CONFIG_IPV6/" $(HOSTAPD_CONFIG)
+endef
+endif
+else
+define HOSTAPD_EAP_CONFIG
+ $(SED) "s/^CONFIG_EAP/#CONFIG_EAP/g" $(HOSTAPD_CONFIG)
+ $(SED) "s/^#CONFIG_NO_ACCOUNTING/CONFIG_NO_ACCOUNTING/" $(HOSTAPD_CONFIG)
+ $(SED) "s/^#CONFIG_NO_RADIUS/CONFIG_NO_RADIUS/" $(HOSTAPD_CONFIG)
endef
endif
ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y)
-define HOSTAPD_WPS_CONF
- echo "CONFIG_WPS=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_WPS_UPNP=y" >>$(HOSTAPD_CONFIG)
+define HOSTAPD_WPS_CONFIG
+ $(SED) "s/^#CONFIG_WPS/CONFIG_WPS/g" $(HOSTAPD_CONFIG)
endef
endif
@@ -50,28 +70,18 @@ define HOSTAPD_CONFIGURE_CMDS
echo "CFLAGS += $(TARGET_CFLAGS)" >>$(HOSTAPD_CONFIG)
echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(HOSTAPD_CONFIG)
echo "CC = $(TARGET_CC)" >>$(HOSTAPD_CONFIG)
-# EAP
- echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG)
# Drivers
- echo "CONFIG_DRIVER_WIRED=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_DRIVER_PRISM54=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_DRIVER_NL80211=y" >>$(HOSTAPD_CONFIG)
+ $(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG)
+ $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(HOSTAPD_CONFIG)
# Misc
- echo "CONFIG_IEEE80211N=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_IEEE80211R=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_IEEE80211W=y" >>$(HOSTAPD_CONFIG)
- echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG)
- $(HOSTAPD_OPENSSL_CONF)
- $(HOSTAPD_IPV6_CONF)
- $(HOSTAPD_EXTRA_EAP_CONF)
- $(HOSTAPD_WPS_CONF)
+ $(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG)
+ $(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG)
+ $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG)
+ $(HOSTAPD_CRYPTO_CONFIG)
+ $(HOSTAPD_TLS_CONFIG)
+ $(HOSTAPD_RADIUS_IPV6_CONFIG)
+ $(HOSTAPD_EAP_CONFIG)
+ $(HOSTAPD_WPS_CONFIG)
endef
define HOSTAPD_INSTALL_TARGET_CMDS
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 58ecc87bb..ae2d433de 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -3,7 +3,7 @@
# mtd provides jffs2 utilities
#
#############################################################
-MTD_VERSION:=1.4.0
+MTD_VERSION:=1.4.1
MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2
MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils
ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 5447b6c1c..ee9d9bc5d 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -3,7 +3,7 @@
# alsa-lib
#
#############################################################
-ALSA_LIB_VERSION = 1.0.22
+ALSA_LIB_VERSION = 1.0.23
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
ALSA_LIB_INSTALL_STAGING = YES
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index 47c792f74..0fe2bc886 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -9,6 +9,7 @@ NETSNMP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/n
NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz
NETSNMP_INSTALL_STAGING = YES
NETSNMP_LIBTOOL_PATCH = NO
+NETSNMP_MAKE = $(MAKE1)
NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp --disable-static \
--with-defaults --enable-mini-agent --without-rpm \
@@ -40,14 +41,14 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
endif
define NETSNMP_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \
DESTDIR=$(TARGET_DIR) install
$(INSTALL) -D -m 0755 package/netsnmp/S59snmpd \
$(TARGET_DIR)/etc/init.d/S59snmpd
endef
define NETSNMP_UNINSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+ $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \
DESTDIR=$(TARGET_DIR) uninstall
rm -f $(TARGET_DIR)/etc/init.d/S59snmpd
rm -f $(TARGET_DIR)/usr/lib/libnetsnmp*
diff --git a/package/ng-spice-rework/Config.in b/package/ng-spice-rework/Config.in
index a82f439fc..de5d091e0 100644
--- a/package/ng-spice-rework/Config.in
+++ b/package/ng-spice-rework/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_NG_SPICE_REWORK
bool "ng-spice-rework"
+ depends on BR2_DEPRECATED
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXAW
help
diff --git a/package/openssl/openssl-nofips.patch b/package/openssl/openssl-nofips.patch
deleted file mode 100644
index 0edea3ebc..000000000
--- a/package/openssl/openssl-nofips.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura openssl-0.9.8k/Makefile.org openssl-0.9.8k.nofips/Makefile.org
---- openssl-0.9.8k/Makefile.org 2009-03-03 20:40:29.000000000 -0200
-+++ openssl-0.9.8k.nofips/Makefile.org 2009-03-26 09:50:27.000000000 -0300
-@@ -131,7 +131,7 @@
-
- BASEADDR=
-
--DIRS= crypto fips ssl engines apps test tools
-+DIRS= crypto ssl engines apps test tools
- SHLIBDIRS= crypto ssl fips
-
- # dirs in crypto to build
diff --git a/package/openssl/openssl-optional-ipv6.patch b/package/openssl/openssl-optional-ipv6.patch
deleted file mode 100644
index 2876058bd..000000000
--- a/package/openssl/openssl-optional-ipv6.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-[PATCH] openssl: fix build without IPv6 support
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- crypto/bio/bss_dgram.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-Index: openssl-0.9.8n/crypto/bio/bss_dgram.c
-===================================================================
---- openssl-0.9.8n.orig/crypto/bio/bss_dgram.c
-+++ openssl-0.9.8n/crypto/bio/bss_dgram.c
-@@ -61,6 +61,12 @@
-
- #include <stdio.h>
- #include <errno.h>
-+#include <features.h>
-+
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-+
- #define USE_SOCKETS
- #include "cryptlib.h"
-
-@@ -429,12 +435,14 @@ static long dgram_ctrl(BIO *b, int cmd,
- &sockopt_val, sizeof(sockopt_val))) < 0)
- perror("setsockopt");
- break;
-+#ifndef NO_IPV6
- case AF_INET6:
- sockopt_val = IPV6_PMTUDISC_DO;
- if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
- &sockopt_val, sizeof(sockopt_val))) < 0)
- perror("setsockopt");
- break;
-+#endif
- default:
- ret = -1;
- break;
-@@ -470,6 +478,7 @@ static long dgram_ctrl(BIO *b, int cmd,
- ret = data->mtu;
- }
- break;
-+#ifndef NO_IPV6
- case AF_INET6:
- if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val,
- &sockopt_len)) < 0 || sockopt_val < 0)
-@@ -485,6 +494,7 @@ static long dgram_ctrl(BIO *b, int cmd,
- ret = data->mtu;
- }
- break;
-+#endif
- default:
- ret = 0;
- break;
diff --git a/package/openssl/openssl-uclibc-susv3-legacy.patch b/package/openssl/openssl-uclibc-susv3-legacy.patch
deleted file mode 100644
index eb1d27798..000000000
--- a/package/openssl/openssl-uclibc-susv3-legacy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-sys/timeb.h / ftime are legacy, so don't enable them for uClibc
----
- apps/speed.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: openssl-0.9.8g/apps/speed.c
-===================================================================
---- openssl-0.9.8g.orig/apps/speed.c
-+++ openssl-0.9.8g/apps/speed.c
-@@ -113,7 +113,7 @@
- #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
- # define TIMES
- #endif
--#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
-+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
- # define TIMEB
- #endif
-
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 22b14f255..de20b8191 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -3,19 +3,28 @@
# openssl
#
#############################################################
-OPENSSL_VERSION:=0.9.8o
-OPENSSL_SITE:=http://www.openssl.org/source
+
+OPENSSL_VERSION = 1.0.0a
+OPENSSL_SITE = http://www.openssl.org/source
OPENSSL_INSTALL_STAGING = YES
OPENSSL_DEPENDENCIES = zlib
-
-OPENSSL_TARGET_ARCH=generic32
+OPENSSL_TARGET_ARCH = generic32
# Some architectures are optimized in OpenSSL
+ifeq ($(ARCH),arm)
+ifneq ($(BR2_generic_arm),y)
+ifneq ($(BR2_arm610),y)
+ifneq ($(BR2_arm710),y)
+ OPENSSL_TARGET_ARCH = armv4
+endif
+endif
+endif
+endif
ifeq ($(ARCH),powerpc)
-OPENSSL_TARGET_ARCH=ppc
+ OPENSSL_TARGET_ARCH = ppc
endif
ifeq ($(ARCH),x86_64)
-OPENSSL_TARGET_ARCH=x86_64
+ OPENSSL_TARGET_ARCH = x86_64
endif
define OPENSSL_CONFIGURE_CMDS
diff --git a/package/pppd/Config.in b/package/pppd/Config.in
index daca87613..879b263cf 100644
--- a/package/pppd/Config.in
+++ b/package/pppd/Config.in
@@ -13,3 +13,9 @@ config BR2_PACKAGE_PPPD_FILTER
Packet filtering abilities for pppd. If enabled,
the pppd active-filter and pass-filter options
are available.
+
+config BR2_PACKAGE_PPPD_RADIUS
+ depends on BR2_PACKAGE_PPPD
+ bool "radius"
+ help
+ Install RADIUS support for pppd
diff --git a/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch b/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch
new file mode 100644
index 000000000..0e71e2409
--- /dev/null
+++ b/package/pppd/pppd-2.4.5-ol2tpv3-2.6.35.patch
@@ -0,0 +1,24 @@
+--- ppp-2.4.5/include/linux/if_pppol2tp.h 2009-11-16 22:26:07.000000000 +0000
++++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-07-16 22:35:22.000000000 +0100
+@@ -32,6 +32,20 @@
+ __u16 d_tunnel, d_session; /* For sending outgoing packets */
+ };
+
++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
++ * bits. So we need a different sockaddr structure.
++ */
++struct pppol2tpv3_addr {
++ pid_t pid; /* pid that owns the fd.
++ * 0 => current */
++ int fd; /* FD of UDP or IP socket to use */
++
++ struct sockaddr_in addr; /* IP address and port to send to */
++
++ __u32 s_tunnel, s_session; /* For matching incoming packets */
++ __u32 d_tunnel, d_session; /* For sending outgoing packets */
++};
++
+ /* Socket options:
+ * DEBUG - bitmask of debug message categories
+ * SENDSEQ - 0 => don't send packets with sequence numbers
+
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 35fd451d7..05c1c32c9 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -9,7 +9,10 @@ PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
PPPD_SITE = ftp://ftp.samba.org/pub/ppp
PPPD_TARGET_BINS = chat pppd pppdump pppstats
PPPD_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),chat pppd pppdump pppstats)
-PPPD_MAKE = $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" -C $(PPPD_DIR) $(PPPD_MAKE_OPT)
+PPPD_RADIUS_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),pppd-radattr pppd-radius)
+PPPD_RADIUS_CONF = dictionary dictionary.ascend dictionary.compat \
+ dictionary.merit dictionary.microsoft \
+ issue port-id-map realms server radiusclient.conf
ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
PPPD_DEPENDENCIES += libpcap
@@ -20,15 +23,56 @@ ifeq ($(BR2_INET_IPV6),y)
PPPD_MAKE_OPT += HAVE_INET6=y
endif
-$(eval $(call AUTOTARGETS,package,pppd))
-
-$(PPPD_HOOK_POST_EXTRACT):
+define PPPD_CONFIGURE_CMDS
$(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
$(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux
- touch $@
+ ( cd $(@D); ./configure )
+endef
+
+define PPPD_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
+ -C $(@D) $(PPPD_MAKE_OPT)
+endef
+
+define PPPD_UNINSTALL_TARGET_CMDS
+ rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(PPPD_TARGET_BINS))
+ rm -f $(TARGET_DIR)/usr/sbin/pppoe-discovery
+ rm -rf $(TARGET_DIR)/usr/lib/pppd
+ rm -rf $(TARGET_DIR)/etc/ppp/radius
+ for m in $(PPPD_MANPAGES); do \
+ rm -f $(TARGET_DIR)/usr/share/man/man8/$$m.8; \
+ done
+ for m in $(PPPD_RADIUS_MANPAGES); do \
+ rm -f $(TARGET_DIR)/usr/share/man/man8/$$m.8; \
+ done
+endef
+
+ifeq ($(BR2_PACKAGE_PPPD_RADIUS),y)
+define PPPD_INSTALL_RADIUS
+ $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radattr.so \
+ $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radattr.so
+ $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radius.so \
+ $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radius.so
+ $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radrealms.so \
+ $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radrealms.so
+ for m in $(PPPD_RADIUS_CONF); do \
+ $(INSTALL) -m 644 -D $(PPPD_DIR)/pppd/plugins/radius/etc/$$m \
+ $(TARGET_DIR)/etc/ppp/radius/$$m; \
+ done
+ $(SED) 's:/usr/local/etc:/etc:' \
+ $(TARGET_DIR)/etc/ppp/radius/radiusclient.conf
+ $(SED) 's:/usr/local/sbin:/usr/sbin:' \
+ $(TARGET_DIR)/etc/ppp/radius/radiusclient.conf
+ $(SED) 's:/etc/radiusclient:/etc/ppp/radius:g' \
+ $(TARGET_DIR)/etc/ppp/radius/*
+ for m in $(PPPD_RADIUS_MANPAGES); do \
+ $(INSTALL) -m 644 -D $(PPPD_DIR)/pppd/plugins/radius/$$m.8 \
+ $(TARGET_DIR)/usr/share/man/man8/$$m.8; \
+ done
+endef
+endif
-$(PPPD_TARGET_INSTALL_TARGET):
- $(call MESSAGE,"Installing to target")
+define PPPD_INSTALL_TARGET_CMDS
for sbin in $(PPPD_TARGET_BINS); do \
$(INSTALL) -D $(PPPD_DIR)/$$sbin/$$sbin \
$(TARGET_DIR)/usr/sbin/$$sbin; \
@@ -51,24 +95,11 @@ $(PPPD_TARGET_INSTALL_TARGET):
$(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/openl2tp.so
$(INSTALL) -D $(PPPD_DIR)/pppd/plugins/pppol2tp/pppol2tp.so \
$(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/pppol2tp.so
- $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radattr.so \
- $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radattr.so
- $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radius.so \
- $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radius.so
- $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radrealms.so \
- $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radrealms.so
+ $(PPPD_INSTALL_RADIUS)
for m in $(PPPD_MANPAGES); do \
$(INSTALL) -m 644 -D $(PPPD_DIR)/$$m/$$m.8 \
$(TARGET_DIR)/usr/share/man/man8/$$m.8; \
done
- touch $@
+endef
-$(PPPD_TARGET_UNINSTALL):
- $(call MESSAGE,"Uninstalling")
- rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(PPPD_TARGET_BINS))
- rm -f $(TARGET_DIR)/usr/sbin/pppoe-discovery
- for m in $(PPPD_MANPAGES); do \
- rm -f $(TARGET_DIR)/usr/share/man/man8/$$m.8; \
- done
- rm -rf $(TARGET_DIR)/usr/lib/pppd
- rm -f $(PPPD_TARGET_INSTALL_TARGET) $(PPPD_HOOK_POST_INSTALL)
+$(eval $(call GENTARGETS,package,pppd))
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index ec4a8959e..ad669ac07 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -12,6 +12,9 @@ STARTUP_NOTIFICATION_INSTALL_TARGET = YES
STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11
STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes
+STARTUP_NOTIFICATION_CONF_OPT = --with-x \
+ --x-includes="$(STAGING_DIR)/usr/include/X11" \
+ --x-libraries="$(STAGING_DIR)/usr/lib"
$(eval $(call AUTOTARGETS,package,startup-notification))
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index 03477d175..2b1cb8d8b 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -10,6 +10,8 @@ TORSMO_AUTORECONF = NO
TORSMO_INSTALL_STAGING = NO
TORSMO_INSTALL_TARGET = YES
+# help2man doesn't work when cross compiling
+TORSMO_CONF_ENV = ac_cv_path_HELP2MAN=''
TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x
TORSMO_DEPENDENCIES = xserver_xorg-server
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index c8c68d27b..64a56ccf2 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -19,6 +19,11 @@ VSFTPD_LIBS += -lssl
VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL
endif
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+VSFTPD_DEPENDENCIES += libcap
+VSFTPD_LIBS += -lcap
+endif
+
define VSFTPD_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D)
diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index 4b5023972..e3df2b4d8 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -6,17 +6,10 @@ config BR2_PACKAGE_WPA_SUPPLICANT
http://hostap.epitest.fi/wpa_supplicant/
config BR2_PACKAGE_WPA_SUPPLICANT_EAP
- bool "Enable WPA with EAP"
+ bool "Enable EAP"
depends on BR2_PACKAGE_WPA_SUPPLICANT
help
- Enable WPA with EAP (IEEE 802.1X)
-
-config BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL
- bool "Use openssl TLS (recommended)"
- depends on BR2_PACKAGE_WPA_SUPPLICANT && BR2_PACKAGE_WPA_SUPPLICANT_EAP
- select BR2_PACKAGE_OPENSSL
- help
- Use OpenSSL's TLS implementation instead of internal libtommath.
+ Enable support for EAP.
config BR2_PACKAGE_WPA_SUPPLICANT_CLI
bool "Install wpa_cli binary"
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index cebc4fb6b..bfd20ab1e 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -4,7 +4,7 @@
#
#############################################################
-WPA_SUPPLICANT_VERSION = 0.6.10
+WPA_SUPPLICANT_VERSION = 0.7.3
WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
WPA_SUPPLICANT_LIBTOOL_PATCH = NO
WPA_SUPPLICANT_DEPENDENCIES =
@@ -16,28 +16,34 @@ WPA_SUPPLICANT_DBUS_SERVICE = fi.epitest.hostap.WPASupplicant
ifeq ($(BR2_PACKAGE_LIBNL),y)
WPA_SUPPLICANT_DEPENDENCIES += libnl
define WPA_SUPPLICANT_LIBNL_CONFIG
- echo "CONFIG_DRIVER_NL80211=y" >>$(WPA_SUPPLICANT_CONFIG)
+ $(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(WPA_SUPPLICANT_CONFIG)
endef
endif
ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y)
-define WPA_SUPPLICANT_CRYPTO_CONFIG
+define WPA_SUPPLICANT_EAP_CONFIG
$(SED) "s/^CONFIG_EAP_*/#CONFIG_EAP_/g" $(WPA_SUPPLICANT_CONFIG)
- echo "CONFIG_TLS=none" >>$(WPA_SUPPLICANT_CONFIG)
endef
-else
-ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL),y)
- WPA_SUPPLICANT_DEPENDENCIES += openssl
+endif
+
define WPA_SUPPLICANT_CRYPTO_CONFIG
+ echo "CONFIG_CRYPTO=internal" >>$(WPA_SUPPLICANT_CONFIG)
+ echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG)
+ echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(WPA_SUPPLICANT_CONFIG)
+endef
+
+# Try to use openssl for TLS if it's already available
+# gnutls is also supported for TLS
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ WPA_SUPPLICANT_DEPENDENCIES += openssl
+define WPA_SUPPLICANT_TLS_CONFIG
echo "CONFIG_TLS=openssl" >>$(WPA_SUPPLICANT_CONFIG)
endef
else
-define WPA_SUPPLICANT_CRYPTO_CONFIG
+define WPA_SUPPLICANT_TLS_CONFIG
echo "CONFIG_TLS=internal" >>$(WPA_SUPPLICANT_CONFIG)
- echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(WPA_SUPPLICANT_CONFIG)
endef
endif
-endif
ifeq ($(BR2_PACKAGE_DBUS),y)
WPA_SUPPLICANT_DEPENDENCIES += host-pkg-config dbus
@@ -45,7 +51,7 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
define WPA_SUPPLICANT_DBUS_CONFIG
- echo "CONFIG_CTRL_IFACE_DBUS=y" >>$(WPA_SUPPLICANT_CONFIG)
+ $(SED) "s/^#CONFIG_CTRL_IFACE_DBUS/CONFIG_CTRL_IFACE_DBUS/" $(WPA_SUPPLICANT_CONFIG)
endef
endif
@@ -54,8 +60,14 @@ define WPA_SUPPLICANT_CONFIGURE_CMDS
echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG)
+ $(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(WPA_SUPPLICANT_CONFIG)
+ $(SED) "s/^#CONFIG_DELAYED_MIC/CONFIG_DELAYED_MIC/" $(WPA_SUPPLICANT_CONFIG)
+ $(SED) "s/^CONFIG_DRIVER_ATMEL/#CONFIG_DRIVER_ATMEL/" $(WPA_SUPPLICANT_CONFIG)
+ $(SED) "s/^CONFIG_SMARTCARD/#CONFIG_SMARTCARD/" $(WPA_SUPPLICANT_CONFIG)
$(SED) "s/\/local//" $(@D)/wpa_supplicant/Makefile
$(WPA_SUPPLICANT_CRYPTO_CONFIG)
+ $(WPA_SUPPLICANT_TLS_CONFIG)
+ $(WPA_SUPPLICANT_EAP_CONFIG)
$(WPA_SUPPLICANT_LIBNL_CONFIG)
$(WPA_SUPPLICANT_DBUS_CONFIG)
endef
@@ -78,10 +90,10 @@ endif
define WPA_SUPPLICANT_INSTALL_DBUS
$(INSTALL) -D \
- $(@D)/wpa_supplicant/dbus-wpa_supplicant.conf \
+ $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
$(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf
$(INSTALL) -D \
- $(@D)/wpa_supplicant/dbus-wpa_supplicant.service \
+ $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_SERVICE).service \
$(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service
endef
diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
index c42ffa4a5..746564ffd 100644
--- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
+++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XAPP_XCURSORGEN_VERSION = 1.0.3
+XAPP_XCURSORGEN_VERSION = 1.0.4
XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2
XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCURSORGEN_AUTORECONF = NO
diff --git a/package/x11r7/xapp_xinput/Config.in b/package/x11r7/xapp_xinput/Config.in
index 55c47accf..2505dd349 100644
--- a/package/x11r7/xapp_xinput/Config.in
+++ b/package/x11r7/xapp_xinput/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_XAPP_XINPUT
bool "xinput"
select BR2_PACKAGE_XLIB_LIBX11
+ select BR2_PACKAGE_XLIB_LIBXI
help
xinput
diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk
index 20d23f283..423c7c2f0 100644
--- a/package/x11r7/xapp_xinput/xapp_xinput.mk
+++ b/package/x11r7/xapp_xinput/xapp_xinput.mk
@@ -8,6 +8,6 @@ XAPP_XINPUT_VERSION = 1.5.0
XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2
XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XINPUT_AUTORECONF = NO
-XAPP_XINPUT_DEPENDENCIES = xlib_libX11
+XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi
$(eval $(call AUTOTARGETS,package/x11r7,xapp_xinput))
diff --git a/package/x11r7/xapp_xmore/Config.in b/package/x11r7/xapp_xmore/Config.in
index 877d6fb78..23fd1477b 100644
--- a/package/x11r7/xapp_xmore/Config.in
+++ b/package/x11r7/xapp_xmore/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XAPP_XMORE
bool "xmore"
select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
- select BR2_PACKAGE_XLIB_LIBXPRINTUTIL
+ select BR2_PACKAGE_XLIB_LIBXAW
help
plain text display program for the X Window System
diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk
index 8471ebb50..0b68e7196 100644
--- a/package/x11r7/xapp_xmore/xapp_xmore.mk
+++ b/package/x11r7/xapp_xmore/xapp_xmore.mk
@@ -8,6 +8,6 @@ XAPP_XMORE_VERSION = 1.0.1
XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2
XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XMORE_AUTORECONF = NO
-XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXprintUtil
+XAPP_XMORE_DEPENDENCIES = xlib_libXprintUtil xlib_libXaw
$(eval $(call AUTOTARGETS,package/x11r7,xapp_xmore))