[Buildroot] [PATCH 01/14] scons: bump to version 2.2.0

[Buildroot] [PATCH 01/14] scons: bump to version 2.2.0

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/scons/scons.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index d2489a0..79fd6b1 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -1,4 +1,4 @@
-SCONS_VERSION = 2.0.1
+SCONS_VERSION = 2.2.0
 SCONS_SOURCE = scons-$(SCONS_VERSION).tar.gz
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
 SCONS_LICENSE = MIT
-- 
1.7.8.6

[Buildroot] [PATCH 02/14] hdparm: bump to version 9.43

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/hdparm/hdparm.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index 76223f4..f70d232 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-HDPARM_VERSION = 9.42
+HDPARM_VERSION = 9.43
 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm
 HDPARM_LICENSE = BSD-Style
 HDPARM_LICENSE_FILES = LICENSE.TXT
-- 
1.7.8.6

[Buildroot] [PATCH 03/14] radvd: bump to version 1.9.2

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/radvd/radvd-highjob.patch |   27 ---------------------------
 package/radvd/radvd.mk            |    2 +-
 2 files changed, 1 insertions(+), 28 deletions(-)
 delete mode 100644 package/radvd/radvd-highjob.patch

diff --git a/package/radvd/radvd-highjob.patch b/package/radvd/radvd-highjob.patch
deleted file mode 100644
index 5945435..0000000
--- a/package/radvd/radvd-highjob.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ce4911c13a3ab6877c0288c8a1874decb5d0e90a Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 23 Jul 2012 09:14:24 -0300
-Subject: [PATCH] Makefile: fix high jobcount build failures
-
-gram.h is a dependency for scanner.c rather than scanner.o which is
-unused.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 04b834b..8a90ca7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -131,5 +131,5 @@ dist-hook:
- 	rm -f $(distdir)/gram.h
- 	rm -f $(distdir)/scanner.c
- 
--scanner.o: gram.h
-+scanner.c: gram.h
- 
--- 
-1.7.8.6
-
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 6151236..2a60729 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RADVD_VERSION = 1.9.1
+RADVD_VERSION = 1.9.2
 RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = flex libdaemon host-flex host-pkgconf
 RADVD_AUTORECONF = YES
-- 
1.7.8.6

[Buildroot] [PATCH 04/14] libnl: bump to version 3.2.16

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libnl/libnl.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index e039fd4..9bf680e 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBNL_VERSION = 3.2.14
+LIBNL_VERSION = 3.2.16
 LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
 LIBNL_LICENSE = LGPLv2.1+
 LIBNL_LICENSE_FILES = COPYING
-- 
1.7.8.6

[Buildroot] [PATCH 05/14] php: bump to version 5.3.19

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/php/php.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 0dfb6db..4290170 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.18
+PHP_VERSION = 5.3.19
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
-- 
1.7.8.6

[Buildroot] [PATCH 06/14] ipset: bump to version 6.16.1

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/ipset/ipset.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 999c5cb..3ef9747 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.14
+IPSET_VERSION = 6.16.1
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf
-- 
1.7.8.6

[Buildroot] [PATCH 07/14] ed: bump to version 1.7

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/ed/ed.mk |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index a97e19b..2bb8e0e 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-ED_VERSION = 1.6
+ED_VERSION = 1.7
 ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)"
+ED_LICENSE = GPLv3+
+ED_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
-- 
1.7.8.6

[Buildroot] [PATCH 08/14] polarssl: bump to version 1.2.3

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../polarssl-shared-and-static-library.patch       |   10 +++++-----
 package/polarssl/polarssl.mk                       |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/polarssl/polarssl-shared-and-static-library.patch b/package/polarssl/polarssl-shared-and-static-library.patch
index e11cab3..ec65285 100644
--- a/package/polarssl/polarssl-shared-and-static-library.patch
+++ b/package/polarssl/polarssl-shared-and-static-library.patch
@@ -9,13 +9,13 @@ This patch adds the USE_STATIC_POLARSSL_LIBRARY (which defaults to ON)
 in addition to the existing USE_SHARED_POLARSSL_LIBRARY (which
 defaults to OFF). Both options can be manipulated independently.
 
-[Gustavo: update for polarssl 1.2.0]
+[Gustavo: update for polarssl 1.2.3]
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 
-diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMakeLists.txt
---- polarssl-1.2.0.orig/library/CMakeLists.txt	2012-11-15 15:01:58.239248830 -0300
-+++ polarssl-1.2.0/library/CMakeLists.txt	2012-11-15 15:00:10.310806353 -0300
+diff -Nura polarssl-1.2.3.orig/library/CMakeLists.txt polarssl-1.2.3/library/CMakeLists.txt
+--- polarssl-1.2.3.orig/library/CMakeLists.txt	2012-11-27 17:16:20.735678722 -0300
++++ polarssl-1.2.3/library/CMakeLists.txt	2012-11-27 17:18:09.760457733 -0300
 @@ -1,4 +1,5 @@
  option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL as a shared library." OFF)
 +option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL as a static library." ON)
@@ -34,7 +34,7 @@ diff -Nura polarssl-1.2.0.orig/library/CMakeLists.txt polarssl-1.2.0/library/CMa
 +if(USE_SHARED_POLARSSL_LIBRARY)
  
  add_library(polarssl SHARED ${src})
- set_target_properties(polarssl PROPERTIES VERSION 1.2.0 SOVERSION 2)
+ set_target_properties(polarssl PROPERTIES VERSION 1.2.3 SOVERSION 2)
 +set_target_properties(polarssl PROPERTIES OUTPUT_NAME polarssl)
 +
 +endif(USE_SHARED_POLARSSL_LIBRARY)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
index edda9bf..c66c633 100644
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -1,5 +1,5 @@
 POLARSSL_SITE = https://polarssl.org/download
-POLARSSL_VERSION = 1.2.0
+POLARSSL_VERSION = 1.2.3
 POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
 POLARSSL_CONF_OPT = \
 	-DUSE_SHARED_POLARSSL_LIBRARY=ON \
-- 
1.7.8.6

[Buildroot] [PATCH 09/14] libcurl: bump to version 7.28.1

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libcurl/libcurl.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 8d8fdb4..47f7deb 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBCURL_VERSION = 7.27.0
+LIBCURL_VERSION = 7.28.1
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download
 LIBCURL_LICENSE = ICS
-- 
1.7.8.6

[Buildroot] [PATCH 10/14] hostapd: bump to version 1.1

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/hostapd/hostapd-cve-2012-4445.patch |   49 ------------------------
 package/hostapd/hostapd-openssl-1.0.1.patch |   54 ---------------------------
 package/hostapd/hostapd.mk                  |    4 +-
 3 files changed, 3 insertions(+), 104 deletions(-)
 delete mode 100644 package/hostapd/hostapd-cve-2012-4445.patch
 delete mode 100644 package/hostapd/hostapd-openssl-1.0.1.patch

diff --git a/package/hostapd/hostapd-cve-2012-4445.patch b/package/hostapd/hostapd-cve-2012-4445.patch
deleted file mode 100644
index 034a458..0000000
--- a/package/hostapd/hostapd-cve-2012-4445.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 567bacefd73782508bfe72d3624df495f0df4cd1 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sun, 7 Oct 2012 20:06:29 +0300
-Subject: [PATCH] EAP-TLS server: Fix TLS Message Length validation
-
-EAP-TLS/PEAP/TTLS/FAST server implementation did not validate TLS
-Message Length value properly and could end up trying to store more
-information into the message buffer than the allocated size if the first
-fragment is longer than the indicated size. This could result in hostapd
-process terminating in wpabuf length validation. Fix this by rejecting
-messages that have invalid TLS Message Length value.
-
-This would affect cases that use the internal EAP authentication server
-in hostapd either directly with IEEE 802.1X or when using hostapd as a
-RADIUS authentication server and when receiving an incorrectly
-constructed EAP-TLS message. Cases where hostapd uses an external
-authentication are not affected.
-
-Thanks to Timo Warns for finding and reporting this issue.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
-(cherry picked from commit 586c446e0ff42ae00315b014924ec669023bd8de)
----
- src/eap_server/eap_server_tls_common.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/src/eap_server/eap_server_tls_common.c b/src/eap_server/eap_server_tls_common.c
-index e149ee3..2cbe700 100644
---- a/src/eap_server/eap_server_tls_common.c
-+++ b/src/eap_server/eap_server_tls_common.c
-@@ -224,6 +224,14 @@ static int eap_server_tls_process_fragment(struct eap_ssl_data *data,
- 			return -1;
- 		}
- 
-+		if (len > message_length) {
-+			wpa_printf(MSG_INFO, "SSL: Too much data (%d bytes) in "
-+				   "first fragment of frame (TLS Message "
-+				   "Length %d bytes)",
-+				   (int) len, (int) message_length);
-+			return -1;
-+		}
-+
- 		data->tls_in = wpabuf_alloc(message_length);
- 		if (data->tls_in == NULL) {
- 			wpa_printf(MSG_DEBUG, "SSL: No memory for message");
--- 
-1.7.4-rc1
-
diff --git a/package/hostapd/hostapd-openssl-1.0.1.patch b/package/hostapd/hostapd-openssl-1.0.1.patch
deleted file mode 100644
index 2e110f4..0000000
--- a/package/hostapd/hostapd-openssl-1.0.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 17 Aug 2012 23:55:14 +0300
-Subject: [PATCH] Fix EAP-FAST with OpenSSL 1.0.1
-
-The mechanism to figure out key block size based on ssl->read_hash
-does not seem to work with OpenSSL 1.0.1, so add an alternative
-mechanism to figure out the NAC key size that seems to work at
-least with the current OpenSSL 1.0.1 releases.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
-(cherry picked from commit 7f996409e7e5aa0bb066257906e87ab3294d4fd0)
----
- src/crypto/tls_openssl.c |   14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index 6380ce0..c4a76be 100644
---- a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -2785,6 +2785,7 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- {
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
-+	int md_size;
- 
- 	if (conn == NULL || conn->ssl == NULL ||
- 	    conn->ssl->enc_read_ctx == NULL ||
-@@ -2798,9 +2799,20 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- #else
- 	h = conn->ssl->read_hash;
- #endif
-+	if (h)
-+		md_size = EVP_MD_size(h);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	else if (conn->ssl->s3)
-+		md_size = conn->ssl->s3->tmp.new_mac_secret_size;
-+#endif
-+	else
-+		return -1;
- 
-+	wpa_printf(MSG_DEBUG, "OpenSSL: keyblock size: key_len=%d MD_size=%d "
-+		   "IV_len=%d", EVP_CIPHER_key_length(c), md_size,
-+		   EVP_CIPHER_iv_length(c));
- 	return 2 * (EVP_CIPHER_key_length(c) +
--		    EVP_MD_size(h) +
-+		    md_size +
- 		    EVP_CIPHER_iv_length(c));
- }
- 
--- 
-1.7.4-rc1
-
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 82d6231..45a93fc 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -4,13 +4,15 @@
 #
 #############################################################
 
-HOSTAPD_VERSION = 1.0
+HOSTAPD_VERSION = 1.1
 HOSTAPD_SITE = http://hostap.epitest.fi/releases
 HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = libnl
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
 HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS)
+HOSTAPD_LICENSE = GPLv2/BSD-3c
+HOSTAPD_LICENSE_FILES = README
 
 # libnl needs -lm (for rint) if linking statically
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-- 
1.7.8.6

[Buildroot] [PATCH 11/14] wpa_supplicant: bump to version 1.1

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../wpa_supplicant-openssl-1.0.1.patch             |   54 --------------------
 package/wpa_supplicant/wpa_supplicant.mk           |    2 +-
 2 files changed, 1 insertions(+), 55 deletions(-)
 delete mode 100644 package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch

diff --git a/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch b/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch
deleted file mode 100644
index 2e110f4..0000000
--- a/package/wpa_supplicant/wpa_supplicant-openssl-1.0.1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e6e243d97795306aeb604948e7101f9f14e8b8ca Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Fri, 17 Aug 2012 23:55:14 +0300
-Subject: [PATCH] Fix EAP-FAST with OpenSSL 1.0.1
-
-The mechanism to figure out key block size based on ssl->read_hash
-does not seem to work with OpenSSL 1.0.1, so add an alternative
-mechanism to figure out the NAC key size that seems to work at
-least with the current OpenSSL 1.0.1 releases.
-
-Signed-hostap: Jouni Malinen <j@w1.fi>
-intended-for: hostap-1
-(cherry picked from commit 7f996409e7e5aa0bb066257906e87ab3294d4fd0)
----
- src/crypto/tls_openssl.c |   14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index 6380ce0..c4a76be 100644
---- a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -2785,6 +2785,7 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- {
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
-+	int md_size;
- 
- 	if (conn == NULL || conn->ssl == NULL ||
- 	    conn->ssl->enc_read_ctx == NULL ||
-@@ -2798,9 +2799,20 @@ int tls_connection_get_keyblock_size(void *tls_ctx,
- #else
- 	h = conn->ssl->read_hash;
- #endif
-+	if (h)
-+		md_size = EVP_MD_size(h);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	else if (conn->ssl->s3)
-+		md_size = conn->ssl->s3->tmp.new_mac_secret_size;
-+#endif
-+	else
-+		return -1;
- 
-+	wpa_printf(MSG_DEBUG, "OpenSSL: keyblock size: key_len=%d MD_size=%d "
-+		   "IV_len=%d", EVP_CIPHER_key_length(c), md_size,
-+		   EVP_CIPHER_iv_length(c));
- 	return 2 * (EVP_CIPHER_key_length(c) +
--		    EVP_MD_size(h) +
-+		    md_size +
- 		    EVP_CIPHER_iv_length(c));
- }
- 
--- 
-1.7.4-rc1
-
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index febb80c..71be11f 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WPA_SUPPLICANT_VERSION = 1.0
+WPA_SUPPLICANT_VERSION = 1.1
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
 WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c
 WPA_SUPPLICANT_LICENSE_FILES = README
-- 
1.7.8.6

[Buildroot] [PATCH 12/14] lighttpd: security bump to version 1.4.32

[Gustavo Zacarias]

Fixes CVE-2012-5533.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/lighttpd/lighttpd.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 08ce372..18ffbef 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIGHTTPD_VERSION = 1.4.31
+LIGHTTPD_VERSION = 1.4.32
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
 LIGHTTPD_LICENSE = BSD-3c
 LIGHTTPD_LICENSE_FILES = COPYING
-- 
1.7.8.6

[Buildroot] [PATCH 13/14] links: bump to version 2.7

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/links/links.mk |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/package/links/links.mk b/package/links/links.mk
index 5db2ff7..f7401bb 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -4,9 +4,11 @@
 #
 #############################################################
 
-LINKS_VERSION = 2.5
+LINKS_VERSION = 2.7
 LINKS_SITE = http://links.twibright.com/download
 LINKS_DEPENDENCIES = host-pkgconf
+LINKS_LICNSE = GPLv2+
+LINKS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
 LINKS_CONF_OPT += --enable-graphics
-- 
1.7.8.6

[Buildroot] [PATCH 14/14] ltrace: bump to version 0.7.1

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/ltrace/Config.in                           |    3 +-
 ...nning-in-ARM-arch_-dis-en-able_breakpoint.patch |   67 --------------------
 package/ltrace/ltrace-0.6.0-uclibc.patch           |   22 -------
 ...race-0.6.0-events.patch => ltrace-events.patch} |    0
 package/ltrace/ltrace-ppc-waitstatus.patch         |   37 +++++++++++
 package/ltrace/ltrace-uclibc.patch                 |   20 ++++++
 package/ltrace/ltrace.mk                           |   12 +++-
 7 files changed, 66 insertions(+), 95 deletions(-)
 delete mode 100644 package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
 delete mode 100644 package/ltrace/ltrace-0.6.0-uclibc.patch
 rename package/ltrace/{ltrace-0.6.0-events.patch => ltrace-events.patch} (100%)
 create mode 100644 package/ltrace/ltrace-ppc-waitstatus.patch
 create mode 100644 package/ltrace/ltrace-uclibc.patch

diff --git a/package/ltrace/Config.in b/package/ltrace/Config.in
index 4cce767..9fd9aaa 100644
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64)
-	depends on !BR2_xtensa
+	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa)
 	select BR2_PACKAGE_LIBELF
 	help
 	  Debugging program which runs a specified command until it exits.
diff --git a/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch b/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
deleted file mode 100644
index c005932..0000000
--- a/package/ltrace/ltrace-0.6.0-fix-type-punning-in-ARM-arch_-dis-en-able_breakpoint.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c46448f4e5a4c124fbc75ca9b14697212e676893 Mon Sep 17 00:00:00 2001
-From: Michael K. Edwards <m.k.edwards@gmail.com>
-Date: Mon, 7 Mar 2011 16:15:48 +0000
-Subject: [PATCH] fix type punning in ARM arch_(dis|en)able_breakpoint
-
----
- sysdeps/linux-gnu/arm/breakpoint.c |   26 ++++++++++++++++++--------
- 1 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/sysdeps/linux-gnu/arm/breakpoint.c b/sysdeps/linux-gnu/arm/breakpoint.c
-index 4a5ab92..4e17940 100644
---- a/sysdeps/linux-gnu/arm/breakpoint.c
-+++ b/sysdeps/linux-gnu/arm/breakpoint.c
-@@ -35,10 +35,15 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
- 	debug(1, "arch_enable_breakpoint(%d,%p)", pid, sbp->addr);
- 
- 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
--		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
--		unsigned char *bytes = (unsigned char *)&a;
-+		union _ { long l; unsigned char b[SIZEOF_LONG]; };
-+		union _ orig, current;
-+		unsigned char *bytes = current.b;
-+		for (j = 0; j < sizeof(long); j++) {
-+			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
-+		}
-+		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
- 
--		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
-+		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
- 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
- 
- 			sbp->orig_value[i * sizeof(long) + j] = bytes[j];
-@@ -49,7 +54,7 @@ arch_enable_breakpoint(pid_t pid, Breakpoint *sbp) {
- 				bytes[j] = thumb_break_insn[i * sizeof(long) + j];
- 			}
- 		}
--		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
-+		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
- 	}
- }
- 
-@@ -60,13 +65,18 @@ arch_disable_breakpoint(pid_t pid, const Breakpoint *sbp) {
- 	debug(1, "arch_disable_breakpoint(%d,%p)", pid, sbp->addr);
- 
- 	for (i = 0; i < 1 + ((BREAKPOINT_LENGTH - 1) / sizeof(long)); i++) {
--		long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
--		unsigned char *bytes = (unsigned char *)&a;
-+		union _ { long l; unsigned char b[SIZEOF_LONG]; };
-+		union _ orig, current;
-+		unsigned char *bytes = current.b;
-+		for (j = 0; j < sizeof(long); j++) {
-+			orig.b[j] = sbp->orig_value[i * sizeof(long) + j];
-+		}
-+		current.l = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i * sizeof(long), 0);
- 
--		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", a, *(long *)&sbp->orig_value, sbp->thumb_mode);
-+		debug(2, "current = 0x%lx, orig_value = 0x%lx, thumb_mode = %d", current.l, orig.l, sbp->thumb_mode);
- 		for (j = 0; j < sizeof(long) && i * sizeof(long) + j < BREAKPOINT_LENGTH; j++) {
- 			bytes[j] = sbp->orig_value[i * sizeof(long) + j];
- 		}
--		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), a);
-+		ptrace(PTRACE_POKETEXT, pid, sbp->addr + i * sizeof(long), current.l);
- 	}
- }
--- 
-1.7.4.1
-
diff --git a/package/ltrace/ltrace-0.6.0-uclibc.patch b/package/ltrace/ltrace-0.6.0-uclibc.patch
deleted file mode 100644
index 8bec2ae..0000000
--- a/package/ltrace/ltrace-0.6.0-uclibc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] configure.ac: Recognize linux-uclibc as well
-
-Ltrace works on uClibc as well as on glibc, so accept it.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ltrace-0.6.0/configure.ac
-===================================================================
---- ltrace-0.6.0.orig/configure.ac
-+++ ltrace-0.6.0/configure.ac
-@@ -11,7 +11,7 @@
- AC_CANONICAL_HOST
- 
- case "${host_os}" in
--    linux-gnu*)	HOST_OS="linux-gnu" ;;
-+    linux-gnu* | linux-uclibc*)	HOST_OS="linux-gnu" ;;
-     *)		AC_MSG_ERROR([unkown host-os ${host_osx}]) ;;
- esac
- AC_SUBST(HOST_OS)
diff --git a/package/ltrace/ltrace-0.6.0-events.patch b/package/ltrace/ltrace-events.patch
similarity index 100%
rename from package/ltrace/ltrace-0.6.0-events.patch
rename to package/ltrace/ltrace-events.patch
diff --git a/package/ltrace/ltrace-ppc-waitstatus.patch b/package/ltrace/ltrace-ppc-waitstatus.patch
new file mode 100644
index 0000000..fa87ea4
--- /dev/null
+++ b/package/ltrace/ltrace-ppc-waitstatus.patch
@@ -0,0 +1,37 @@
+From faa8dfe0507b56fb8a7666e326177aec7f364071 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Mon, 3 Dec 2012 11:12:08 -0300
+Subject: [PATCH] Fix build failure on ppc
+
+ppc/trace.c is using waitstatus bits without including the appropiate
+headers, leading to a build failure:
+
+libtool: link:
+/home/gustavoz/b/test/output/host/usr/bin/powerpc-buildroot-linux-uclibc-gcc
+-Wall -Wsign-compare -Wfloat-equal -Wformat-security -pipe -Os -o ltrace
+main.o  ./.libs/libltrace.a -lelf
+./.libs/libltrace.a(lt1-trace.o): In function `syscall_p':
+trace.c:(.text+0x28): undefined reference to `WIFSTOPPED'
+trace.c:(.text+0x40): undefined reference to `WSTOPSIG'
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ sysdeps/linux-gnu/ppc/trace.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/sysdeps/linux-gnu/ppc/trace.c b/sysdeps/linux-gnu/ppc/trace.c
+index c152101..4357a1e 100644
+--- a/sysdeps/linux-gnu/ppc/trace.c
++++ b/sysdeps/linux-gnu/ppc/trace.c
+@@ -29,6 +29,8 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <string.h>
++#include <sys/types.h>
++#include <sys/wait.h>
+ 
+ #include "backend.h"
+ #include "breakpoint.h"
+-- 
+1.7.8.6
+
diff --git a/package/ltrace/ltrace-uclibc.patch b/package/ltrace/ltrace-uclibc.patch
new file mode 100644
index 0000000..c1041fb
--- /dev/null
+++ b/package/ltrace/ltrace-uclibc.patch
@@ -0,0 +1,20 @@
+[PATCH] configure.ac: Recognize linux-uclibc as well
+
+Ltrace works on uClibc as well as on glibc, so accept it.
+
+[Gustavo: update for ltrace 0.7.1]
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura ltrace-0.7.1.orig/configure.ac ltrace-0.7.1/configure.ac
+--- ltrace-0.7.1.orig/configure.ac	2012-12-03 09:02:32.995352741 -0300
++++ ltrace-0.7.1/configure.ac	2012-12-03 09:02:56.579096389 -0300
+@@ -32,7 +32,7 @@
+ AC_CANONICAL_HOST
+ 
+ case "${host_os}" in
+-    linux-gnu*)	HOST_OS="linux-gnu" ;;
++    linux-gnu* | linux-uclibc*)	HOST_OS="linux-gnu" ;;
+     *)		AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
+ esac
+ AC_SUBST(HOST_OS)
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 0e684fb..ca6d621 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -3,10 +3,14 @@
 # ltrace
 #
 #############################################################
-LTRACE_VERSION      = 0.6.0
-LTRACE_SITE         = git://anonscm.debian.org/collab-maint/ltrace.git
+
+LTRACE_VERSION = 0.7.1
+LTRACE_SITE = http://alioth.debian.org/frs/download.php/3844
+LTRACE_SOURCE = ltrace-$(LTRACE_VERSION).tar.bz2
 LTRACE_DEPENDENCIES = libelf
-LTRACE_AUTORECONF   = YES
-LTRACE_CONF_OPT     += --disable-werror
+LTRACE_AUTORECONF = YES
+LTRACE_CONF_OPT = --disable-werror
+LTRACE_LICENSE = GPLv2
+LTRACE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
-- 
1.7.8.6

[Buildroot] [PATCH 14/14] ltrace: bump to version 0.7.1

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Mon,  3 Dec 2012 11:46:12 -0300, Gustavo Zacarias wrote:

>  config BR2_PACKAGE_LTRACE
>  	bool "ltrace"
> -	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64)
> -	depends on !BR2_xtensa
> +	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa)
>  	select BR2_PACKAGE_LIBELF

So now ltrace supports mipsel ?

When there are more changes than just bumping the version name, like
changes in patches and other things, it'd be nice to have a slightly
more elaborate commit log.

And, unrelated to the commit itself, did you try this ltrace version? I
have never been able to get ltrace 0.6 to work on ARM/uClibc.

Best regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 14/14] ltrace: bump to version 0.7.1

[Gustavo Zacarias]

On 12/03/2012 01:45 PM, Thomas Petazzoni wrote:

> Dear Gustavo Zacarias,
> 
> On Mon,  3 Dec 2012 11:46:12 -0300, Gustavo Zacarias wrote:
> 
>>  config BR2_PACKAGE_LTRACE
>>  	bool "ltrace"
>> -	depends on !(BR2_avr32 || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64)
>> -	depends on !BR2_xtensa
>> +	depends on !(BR2_avr32 || BR2_mips || BR2_sh || BR2_sh64 || BR2_xtensa)
>>  	select BR2_PACKAGE_LIBELF
> 
> So now ltrace supports mipsel ?

Oh yes, qemu mipsel tested.

> When there are more changes than just bumping the version name, like
> changes in patches and other things, it'd be nice to have a slightly
> more elaborate commit log.

Yes, i could be more verbose, noted.

> And, unrelated to the commit itself, did you try this ltrace version? I
> have never been able to get ltrace 0.6 to work on ARM/uClibc.

I didn't run test it on ARM, just mipsel to really verify it and ppc to
see that it wasn't broken (and it was, hence the new ppc patch).
I'll fire up a arm qemu build to test it.
Regards.

[Buildroot] [PATCH 14/14] ltrace: bump to version 0.7.1

[Gustavo Zacarias]

On 12/03/2012 01:45 PM, Thomas Petazzoni wrote:

> And, unrelated to the commit itself, did you try this ltrace version? I
> have never been able to get ltrace 0.6 to work on ARM/uClibc.

It still seems broken unfortunately :-/
Regards.

[Buildroot] [PATCH 14/14] ltrace: bump to version 0.7.1

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Mon, 03 Dec 2012 15:15:27 -0300, Gustavo Zacarias wrote:
> On 12/03/2012 01:45 PM, Thomas Petazzoni wrote:
> 
> > And, unrelated to the commit itself, did you try this ltrace version? I
> > have never been able to get ltrace 0.6 to work on ARM/uClibc.
> 
> It still seems broken unfortunately :-/

Ok, too bad. Thanks a lot for testing, though!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 01/14] scons: bump to version 2.2.0

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed series, thanks.

-- 
Bye, Peter Korsgaard