[Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23

[Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    2 +-
 .../alsa-lib-1.0.18-avr32-bad-inline.patch         |   91 --------------------
 .../alsa-lib-1.0.23-avr32-bad-inline.patch         |   91 ++++++++++++++++++++
 package/multimedia/alsa-lib/alsa-lib.mk            |    2 +-
 4 files changed, 93 insertions(+), 93 deletions(-)
 delete mode 100644 package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
 create mode 100644 package/multimedia/alsa-lib/alsa-lib-1.0.23-avr32-bad-inline.patch

diff --git a/CHANGES b/CHANGES
index a9e5d1f..1851543 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
 
 	Toolchain: ARM cortex A9 support
 
-	Updated/fixed packages: berkeleydb, busybox, dropbear,
+	Updated/fixed packages: alsa-lib, berkeleydb, busybox, dropbear,
 	iptables, kismet, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
diff --git a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch b/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
deleted file mode 100644
index 568ba40..0000000
--- a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h
---- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h	2009-01-31 11:02:12.000000000 +0100
-+++ alsa-lib-1.0.18/src/pcm/pcm_local.h	2009-01-31 11:03:24.000000000 +0100
-@@ -611,6 +611,13 @@
- 			   snd_pcm_hw_param_t var);
- int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
- 			  snd_pcm_hw_param_t var, unsigned int val, int dir);
-+
-+#if	defined(AVR32_INLINE_BUG)
-+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
-+						snd_pcm_format_t val);
-+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
-+				     snd_pcm_subformat_t val);
-+#else
- static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
- 						snd_pcm_format_t val)
- {
-@@ -624,7 +631,7 @@
- 	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
- 				     (unsigned long) val, 0);
- }
--
-+#endif
- int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,
- 			      snd_pcm_hw_param_t var, unsigned int val, int dir);
- int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,
-diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c
---- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c	2009-01-31 11:02:12.000000000 +0100
-+++ alsa-lib-1.0.18/src/pcm/pcm_route.c	2009-01-31 11:03:18.000000000 +0100
-@@ -26,6 +26,7 @@
-  *
-  */
-   
-+
- #include <byteswap.h>
- #include <math.h>
- #include "pcm_local.h"
-@@ -106,6 +107,23 @@
- 
- #endif /* DOC_HIDDEN */
- 
-+
-+#if	defined(AVR32_INLINE_BUG)
-+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
-+						snd_pcm_format_t val)
-+{
-+	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,
-+				     (unsigned long) val, 0);
-+}
-+
-+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
-+				     snd_pcm_subformat_t val)
-+{
-+	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
-+				     (unsigned long) val, 0);
-+}
-+#endif
-+
- static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
- 					snd_pcm_uframes_t dst_offset,
- 					const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,
-@@ -483,6 +501,8 @@
- 				  snd_pcm_uframes_t frames,
- 				  snd_pcm_route_params_t *params)
- {
-+#if	defined(AVR32_INLINE_BUG)
-+#endif
- 	unsigned int dst_channel;
- 	snd_pcm_route_ttable_dst_t *dstp;
- 	const snd_pcm_channel_area_t *dst_area;
-@@ -551,8 +571,20 @@
- 	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
- 				   &saccess_mask);
- 	if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {
-+#if	defined(AVR32_INLINE_BUG)
-+/* Start of  of problem */
-+#endif
- 		_snd_pcm_hw_params_set_format(sparams, route->sformat);
- 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
-+#if	0
-+		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,
-+				     (unsigned long) route->sformat, 0);
-+		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,
-+				     (unsigned long) SND_PCM_SUBFORMAT_STD, 0);
-+#endif
-+#if	defined(AVR32_INLINE_BUG)
-+/* End of problem */
-+#endif
- 	}
- 	if (route->schannels >= 0) {
- 		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,
diff --git a/package/multimedia/alsa-lib/alsa-lib-1.0.23-avr32-bad-inline.patch b/package/multimedia/alsa-lib/alsa-lib-1.0.23-avr32-bad-inline.patch
new file mode 100644
index 0000000..568ba40
--- /dev/null
+++ b/package/multimedia/alsa-lib/alsa-lib-1.0.23-avr32-bad-inline.patch
@@ -0,0 +1,91 @@
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h	2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_local.h	2009-01-31 11:03:24.000000000 +0100
+@@ -611,6 +611,13 @@
+ 			   snd_pcm_hw_param_t var);
+ int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
+ 			  snd_pcm_hw_param_t var, unsigned int val, int dir);
++
++#if	defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++						snd_pcm_format_t val);
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++				     snd_pcm_subformat_t val);
++#else
+ static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
+ 						snd_pcm_format_t val)
+ {
+@@ -624,7 +631,7 @@
+ 	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
+ 				     (unsigned long) val, 0);
+ }
+-
++#endif
+ int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,
+ 			      snd_pcm_hw_param_t var, unsigned int val, int dir);
+ int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c	2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_route.c	2009-01-31 11:03:18.000000000 +0100
+@@ -26,6 +26,7 @@
+  *
+  */
+   
++
+ #include <byteswap.h>
+ #include <math.h>
+ #include "pcm_local.h"
+@@ -106,6 +107,23 @@
+ 
+ #endif /* DOC_HIDDEN */
+ 
++
++#if	defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++						snd_pcm_format_t val)
++{
++	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,
++				     (unsigned long) val, 0);
++}
++
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++				     snd_pcm_subformat_t val)
++{
++	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
++				     (unsigned long) val, 0);
++}
++#endif
++
+ static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
+ 					snd_pcm_uframes_t dst_offset,
+ 					const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,
+@@ -483,6 +501,8 @@
+ 				  snd_pcm_uframes_t frames,
+ 				  snd_pcm_route_params_t *params)
+ {
++#if	defined(AVR32_INLINE_BUG)
++#endif
+ 	unsigned int dst_channel;
+ 	snd_pcm_route_ttable_dst_t *dstp;
+ 	const snd_pcm_channel_area_t *dst_area;
+@@ -551,8 +571,20 @@
+ 	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
+ 				   &saccess_mask);
+ 	if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {
++#if	defined(AVR32_INLINE_BUG)
++/* Start of  of problem */
++#endif
+ 		_snd_pcm_hw_params_set_format(sparams, route->sformat);
+ 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
++#if	0
++		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,
++				     (unsigned long) route->sformat, 0);
++		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,
++				     (unsigned long) SND_PCM_SUBFORMAT_STD, 0);
++#endif
++#if	defined(AVR32_INLINE_BUG)
++/* End of problem */
++#endif
+ 	}
+ 	if (route->schannels >= 0) {
+ 		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,
diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 6e4c575..e0e9032 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
-- 
1.7.2.3

[Buildroot] [PATCH 02/21] alsa-utils: bump to 1.0.23

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    4 ++--
 ...tils-1.0.18-check-if-__use_bsd-is-defined.patch |   13 -------------
 .../alsa-utils-1.0.18-fix-intl-support.patch       |   11 -----------
 .../alsa-utils-1.0.18-fix_sysv_legacy.patch        |   20 --------------------
 .../alsa-utils/alsa-utils-1.0.18-remove_man.patch  |   11 -----------
 .../alsa-utils-1.0.23-fix-intl-support.patch       |   11 +++++++++++
 .../alsa-utils/alsa-utils-1.0.23-remove_man.patch  |   11 +++++++++++
 package/multimedia/alsa-utils/alsa-utils.mk        |    2 +-
 8 files changed, 25 insertions(+), 58 deletions(-)
 delete mode 100644 package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch
 delete mode 100644 package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch
 delete mode 100644 package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch
 delete mode 100644 package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch
 create mode 100644 package/multimedia/alsa-utils/alsa-utils-1.0.23-fix-intl-support.patch
 create mode 100644 package/multimedia/alsa-utils/alsa-utils-1.0.23-remove_man.patch

diff --git a/CHANGES b/CHANGES
index 1851543..7b5875c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,8 +7,8 @@
 
 	Toolchain: ARM cortex A9 support
 
-	Updated/fixed packages: alsa-lib, berkeleydb, busybox, dropbear,
-	iptables, kismet, openvpn, qt, usbutils
+	Updated/fixed packages: alsa-lib, alsa-utils, berkeleydb, busybox,
+	dropbear, iptables, kismet, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch
deleted file mode 100644
index f0d3209..0000000
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-check-if-__use_bsd-is-defined.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: alsa-utils-1.0.18/alsactl/init_sysdeps.c
-===================================================================
---- alsa-utils-1.0.18.orig/alsactl/init_sysdeps.c	2008-12-01 08:27:16.000000000 +0100
-+++ alsa-utils-1.0.18/alsactl/init_sysdeps.c	2008-12-01 08:27:22.000000000 +0100
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__USE_BSD)
- static size_t strlcpy(char *dst, const char *src, size_t size)
- {
- 	size_t bytes = 0;
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch
deleted file mode 100644
index 317c472..0000000
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix-intl-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/seq/aseqnet/Makefile.in
-+++ b/seq/aseqnet/Makefile.in
-@@ -252,7 +252,7 @@ clean-binPROGRAMS:
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- aseqnet$(EXEEXT): $(aseqnet_OBJECTS) $(aseqnet_DEPENDENCIES) 
- 	@rm -f aseqnet$(EXEEXT)
--	$(LINK) $(aseqnet_LDFLAGS) $(aseqnet_OBJECTS) $(aseqnet_LDADD) $(LIBS)
-+	$(LINK) $(aseqnet_LDFLAGS) $(aseqnet_OBJECTS) $(aseqnet_LDADD) $(LIBS) $(INTLLIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch
deleted file mode 100644
index c6135b4..0000000
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/alsactl/init_parse.c	2009-01-15 10:44:48.000000000 +0000
-+++ b/alsactl/init_parse.c	2009-01-15 10:46:41.000000000 +0000
-@@ -381,7 +381,7 @@ static int set_ctl_value(struct space *s
- 				snd_ctl_elem_value_set_integer(space->ctl_value, idx, val);
- 			} else if (items > 2 && value[items-2] == 'd' && value[items-1] == 'B') {
- 				val = strtol(value, NULL, 0) * 100;
--				if ((pos2 = index(value, '.')) != NULL) {
-+				if ((pos2 = strchr(value, '.')) != NULL) {
- 					if (isdigit(*(pos2-1)) && isdigit(*(pos2-2))) {
- 						if (val < 0)
- 							val -= strtol(pos2 + 1, NULL, 0);
-@@ -1253,7 +1253,7 @@ static char *new_root_dir(const char *fi
- 
- 	res = strdup(filename);
- 	if (res) {
--		tmp = rindex(res, '/');
-+		tmp = strrchr(res, '/');
- 		if (tmp)
- 			*tmp = '\0';
- 	}
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch
deleted file mode 100644
index a7d4679..0000000
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/alsactl/Makefile.in	2009-01-15 10:59:38.000000000 +0000
-+++ b/alsactl/Makefile.in	2009-01-15 10:59:34.000000000 +0000
-@@ -204,7 +204,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = init
--man_MANS = alsactl.1 alsactl_init.7
-+man_MANS = alsactl.1
- EXTRA_DIST = alsactl.1 alsactl_init.xml
- alsactl_SOURCES = alsactl.c state.c utils.c init_parse.c
- noinst_HEADERS = alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.23-fix-intl-support.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.23-fix-intl-support.patch
new file mode 100644
index 0000000..317c472
--- /dev/null
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.23-fix-intl-support.patch
@@ -0,0 +1,11 @@
+--- a/seq/aseqnet/Makefile.in
++++ b/seq/aseqnet/Makefile.in
+@@ -252,7 +252,7 @@ clean-binPROGRAMS:
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ aseqnet$(EXEEXT): $(aseqnet_OBJECTS) $(aseqnet_DEPENDENCIES) 
+ 	@rm -f aseqnet$(EXEEXT)
+-	$(LINK) $(aseqnet_LDFLAGS) $(aseqnet_OBJECTS) $(aseqnet_LDADD) $(LIBS)
++	$(LINK) $(aseqnet_LDFLAGS) $(aseqnet_OBJECTS) $(aseqnet_LDADD) $(LIBS) $(INTLLIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/package/multimedia/alsa-utils/alsa-utils-1.0.23-remove_man.patch b/package/multimedia/alsa-utils/alsa-utils-1.0.23-remove_man.patch
new file mode 100644
index 0000000..34b14ca
--- /dev/null
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.23-remove_man.patch
@@ -0,0 +1,11 @@
+--- a/alsactl/Makefile.in	2009-01-15 10:59:38.000000000 +0000
++++ b/alsactl/Makefile.in	2009-01-15 10:59:34.000000000 +0000
+@@ -217,7 +217,7 @@ sharedstatedir = @sharedstatedir@
+ target_alias = @target_alias@
+ xmlto = @xmlto@
+ SUBDIRS = init
+-man_MANS = alsactl.1 $(am__append_1)
++man_MANS = alsactl.1
+ EXTRA_DIST = alsactl.1 alsactl_init.xml
+ alsactl_SOURCES = alsactl.c state.c utils.c init_parse.c
+ noinst_HEADERS = alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk
index 3d1b0ef..20f682a 100644
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -3,7 +3,7 @@
 # alsa-utils
 #
 #############################################################
-ALSA_UTILS_VERSION:=1.0.22
+ALSA_UTILS_VERSION:=1.0.23
 ALSA_UTILS_SOURCE:=alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
 ALSA_UTILS_SITE:=ftp://ftp.alsa-project.org/pub/utils
 ALSA_UTILS_DIR:=$(BUILD_DIR)/alsa-utils-$(ALSA_UTILS_VERSION)
-- 
1.7.2.3

[Buildroot] [PATCH 03/21] autoconf: bump to 2.67

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    5 ++-
 ...toconf-2.65-fix-m4-detection-test-on-dash.patch |   36 --------------------
 package/autoconf/autoconf.mk                       |    2 +-
 3 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch

diff --git a/CHANGES b/CHANGES
index 7b5875c..6abd5c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,8 +7,9 @@
 
 	Toolchain: ARM cortex A9 support
 
-	Updated/fixed packages: alsa-lib, alsa-utils, berkeleydb, busybox,
-	dropbear, iptables, kismet, openvpn, qt, usbutils
+	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, 
+	berkeleydb, busybox, dropbear, iptables, kismet, openvpn, qt,
+	usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
deleted file mode 100644
index 35f99b2..0000000
--- a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Patch taken upstream at
-http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669,
-with the following modifications:
-
- * Changes to NEWS file removed to avoid conflicts
-
- * Changes also made manually to the generated configure
-   script. Otherwise, host-autoconf is needed to compile
-   host-autoconf !
-
-Index: autoconf-2.65.old/configure
-===================================================================
---- autoconf-2.65.old.orig/configure	2009-12-15 16:11:05.175566911 +0100
-+++ autoconf-2.65.old/configure	2009-12-15 16:11:37.739562146 +0100
-@@ -2380,7 +2380,7 @@
-       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
-       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
-       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
--      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+      && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-       && test -f conftest.m4f \
-       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
-       rm -f conftest.m4f
-Index: autoconf-2.65.old/m4/m4.m4
-===================================================================
---- autoconf-2.65.old.orig/m4/m4.m4	2009-12-15 16:11:05.207566124 +0100
-+++ autoconf-2.65.old/m4/m4.m4	2009-12-15 16:11:18.595562030 +0100
-@@ -29,7 +29,7 @@
-       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
-       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
-       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
--      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+      && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \
-       && test -f conftest.m4f \
-       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
-       rm -f conftest.m4f],
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 8794466..b1fc52d 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -3,7 +3,7 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION = 2.65
+AUTOCONF_VERSION = 2.67
 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
-- 
1.7.2.3

[Buildroot] [PATCH 04/21] automake: bump to 1.11.1

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                      |    2 +-
 package/automake/automake.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6abd5c0..381e628 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
 
 	Toolchain: ARM cortex A9 support
 
-	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, 
+	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, busybox, dropbear, iptables, kismet, openvpn, qt,
 	usbutils
 
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 46bb773..a7d81ff 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -3,7 +3,7 @@
 # automake
 #
 #############################################################
-AUTOMAKE_VERSION = 1.10
+AUTOMAKE_VERSION = 1.11.1
 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 
-- 
1.7.2.3

[Buildroot] [PATCH 05/21] bison: bump to 2.4.3

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    4 ++--
 .../bison/bison-2.4.3-00-spawn-sched_param.patch   |   12 ++++++++++++
 package/bison/bison.mk                             |    2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 package/bison/bison-2.4.3-00-spawn-sched_param.patch

diff --git a/CHANGES b/CHANGES
index 381e628..3783dd1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,8 @@
 	Toolchain: ARM cortex A9 support
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
-	berkeleydb, busybox, dropbear, iptables, kismet, openvpn, qt,
-	usbutils
+	berkeleydb, bison, busybox, dropbear, iptables, kismet, openvpn,
+	qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/bison/bison-2.4.3-00-spawn-sched_param.patch b/package/bison/bison-2.4.3-00-spawn-sched_param.patch
new file mode 100644
index 0000000..850ac9e
--- /dev/null
+++ b/package/bison/bison-2.4.3-00-spawn-sched_param.patch
@@ -0,0 +1,12 @@
+diff -durpN a/lib/spawn.in.h b/lib/spawn.in.h
+--- a/lib/spawn.in.h    2010-01-28 05:04:07.000000000 -0800
++++ b/lib/spawn.in.h      2010-02-27 23:10:41.000000000 -0800
+@@ -31,7 +31,7 @@
+ 
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+    But avoid namespace pollution on glibc systems.  */
+-#ifndef __GLIBC__
++#if 1
+ # include <sched.h>
+ # include <signal.h>
+ #endif
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 9e28e85..075a078 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -3,7 +3,7 @@
 # bison
 #
 #############################################################
-BISON_VERSION:=2.3
+BISON_VERSION:=2.4.3
 BISON_SOURCE:=bison-$(BISON_VERSION).tar.bz2
 BISON_SITE:=$(BR2_GNU_MIRROR)/bison
 
-- 
1.7.2.3

[Buildroot] [PATCH 06/21] ccache: bump to 3.0.1

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                    |    4 ++--
 toolchain/ccache/ccache.mk |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3783dd1..b9cdd48 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,8 @@
 	Toolchain: ARM cortex A9 support
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
-	berkeleydb, bison, busybox, dropbear, iptables, kismet, openvpn,
-	qt, usbutils
+	berkeleydb, bison, busybox, ccache, dropbear, iptables, kismet,
+	openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/toolchain/ccache/ccache.mk b/toolchain/ccache/ccache.mk
index 8e414b2..01d18fb 100644
--- a/toolchain/ccache/ccache.mk
+++ b/toolchain/ccache/ccache.mk
@@ -3,7 +3,7 @@
 # build ccache to make recompiles faster on the build system
 #
 #############################################################
-CCACHE_VER:=2.4
+CCACHE_VER:=3.0.1
 CCACHE_SITE:=http://samba.org/ftp/ccache
 CCACHE_SOURCE:=ccache-$(CCACHE_VER).tar.gz
 CCACHE_DIR1:=$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)
-- 
1.7.2.3

[Buildroot] [PATCH 07/21] fakeroot: bump to 1.14.4

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                    |    4 ++--
 package/fakeroot/fakeroot-doc.patch        |   11 +++++++----
 package/fakeroot/fakeroot-uclibc-LFS.patch |   14 --------------
 package/fakeroot/fakeroot.mk               |    6 +++---
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 package/fakeroot/fakeroot-uclibc-LFS.patch

diff --git a/CHANGES b/CHANGES
index b9cdd48..0492e3b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,8 @@
 	Toolchain: ARM cortex A9 support
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
-	berkeleydb, bison, busybox, ccache, dropbear, iptables, kismet,
-	openvpn, qt, usbutils
+	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, iptables,
+	kismet, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/fakeroot/fakeroot-doc.patch b/package/fakeroot/fakeroot-doc.patch
index 51a64ca..daa3f5d 100644
--- a/package/fakeroot/fakeroot-doc.patch
+++ b/package/fakeroot/fakeroot-doc.patch
@@ -2,6 +2,7 @@
 +++ fakeroot/Makefile.am	2006-04-19 11:50:59.000000000 -0600
 @@ -1,5 +1,5 @@
  AUTOMAKE_OPTIONS=foreign
+ ACLOCAL_AMFLAGS = -I build-aux
 -SUBDIRS=scripts doc test
 +SUBDIRS=scripts test
  
@@ -9,12 +10,14 @@
  libcommunicate_la_SOURCES = communicate.c
 --- fakeroot/Makefile.in.orig	2006-04-19 11:50:43.000000000 -0600
 +++ fakeroot/Makefile.in	2006-04-19 11:51:21.000000000 -0600
-@@ -230,7 +230,7 @@
- top_builddir = @top_builddir@
+@@ -293,7 +293,7 @@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I build-aux
 -SUBDIRS = scripts doc test
 +SUBDIRS = scripts test
- noinst_LTLIBRARIES = libcommunicate.la
+ noinst_LTLIBRARIES = libcommunicate.la libmacosx.la
  libcommunicate_la_SOURCES = communicate.c
- lib_LTLIBRARIES = libfakeroot.la
+ libmacosx_la_SOURCES = libfakeroot_inode64.c libfakeroot_unix2003.c patchattr.h
+
+
diff --git a/package/fakeroot/fakeroot-uclibc-LFS.patch b/package/fakeroot/fakeroot-uclibc-LFS.patch
deleted file mode 100644
index 53f0b86..0000000
--- a/package/fakeroot/fakeroot-uclibc-LFS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN fakeroot-1.9.3.orig/communicate.h fakeroot-1.9.3/communicate.h
---- fakeroot-1.9.3.orig/communicate.h	2008-03-11 09:42:05.000000000 -0400
-+++ fakeroot-1.9.3/communicate.h	2008-03-11 10:58:10.000000000 -0400
-@@ -35,7 +35,9 @@
- #endif
- 
- /* Then decide whether we do or do not use the stat64 support */
--#if (defined(sun) && !defined(__SunOS_5_5_1) && !defined(_LP64)) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
-+#if (defined(sun) && !defined(__SunOS_5_5_1) && !defined(_LP64)) \
-+    || (!defined __UCLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))) \
-+    || (defined __UCLIBC__ && defined UCLIBC_HAS_LFS)
- # define STAT64_SUPPORT
- #else
- # warning Not using stat64 support
\ No newline at end of file
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index fd60dbe..eb25815 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -3,9 +3,9 @@
 # fakeroot
 #
 #############################################################
-FAKEROOT_VERSION:=1.9.5
-FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
-FAKEROOT_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/f/fakeroot/
+FAKEROOT_VERSION:=1.14.4
+FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
+FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot/
 FAKEROOT_LIBTOOL_PATCH=NO
 
 define FAKEROOT_PATCH_FAKEROOT_IN
-- 
1.7.2.3

[Buildroot] [PATCH 08/21] genext2fs: bump to 1.4.1

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                        |    4 ++--
 package/genext2fs/genext2fs.mk |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0492e3b..94a86e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,8 @@
 	Toolchain: ARM cortex A9 support
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
-	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, iptables,
-	kismet, openvpn, qt, usbutils
+	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
+	iptables, kismet, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 8c4981e..b4a8e70 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GENEXT2FS_VERSION=1.4
+GENEXT2FS_VERSION=1.4.1
 GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
 GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
 
-- 
1.7.2.3

[Buildroot] [PATCH 09/21] gmp: bump to 5.0.1

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES               |    2 +-
 package/gmp/Config.in |    2 +-
 package/gmp/gmp.mk    |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 94a86e8..2185758 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
-	iptables, kismet, openvpn, qt, usbutils
+	gmp, iptables, kismet, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/gmp/Config.in b/package/gmp/Config.in
index 74596f8..9520506 100644
--- a/package/gmp/Config.in
+++ b/package/gmp/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBGMP
 	help
 	  GNU Multiple Precision Arithmetic Library.
 
-	  http://www.swox.com/gmp/
+	  http://gmplib.org/
 
 
 config BR2_PACKAGE_LIBGMP_HEADERS
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index a3488b8..4efd88b 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -3,7 +3,7 @@
 # gmp
 #
 #############################################################
-GMP_VERSION:=4.2.4
+GMP_VERSION:=5.0.1
 GMP_SOURCE:=gmp-$(GMP_VERSION).tar.bz2
 GMP_SITE:=$(BR2_GNU_MIRROR)/gmp
 GMP_CAT:=$(BZCAT)
@@ -11,7 +11,7 @@ GMP_DIR:=$(TOOLCHAIN_DIR)/gmp-$(GMP_VERSION)
 GMP_TARGET_DIR:=$(BUILD_DIR)/gmp-$(GMP_VERSION)
 GMP_BINARY:=libgmp$(LIBTGTEXT)
 GMP_HOST_BINARY:=libgmp$(HOST_LIBEXT)
-GMP_LIBVERSION:=3.4.4
+GMP_LIBVERSION:=10.0.1
 
 # this is a workaround for a bug in GMP, please see
 # http://gmplib.org/list-archives/gmp-devel/2006-April/000618.html
@@ -32,7 +32,7 @@ $(GMP_DIR)/.unpacked: $(DL_DIR)/$(GMP_SOURCE)
 
 $(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked
 	mkdir -p $(GMP_TARGET_DIR)
-	(cd $(GMP_TARGET_DIR); rm -rf config.cache; \
+	(cd $(GMP_TARGET_DIR); rm -rf config.cache; cp $(GMP_DIR)/longlong.h $(GMP_DIR)/gmp-impl.h ./; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		$(GMP_CPP_FLAGS) \
-- 
1.7.2.3

[Buildroot] [PATCH 10/21] libdeamon: bump to 0.14

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    2 +-
 package/libdaemon/libdaemon.mk                     |    3 +-
 .../libdeamon-0.14-buildroot-libtool.patch         |   53 ++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 package/libdaemon/libdeamon-0.14-buildroot-libtool.patch

diff --git a/CHANGES b/CHANGES
index 2185758..e2fa369 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
-	gmp, iptables, kismet, openvpn, qt, usbutils
+	gmp, iptables, kismet, libdeamon, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 7a9d5c8..57b2c7e 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBDAEMON_VERSION:=0.13
+LIBDAEMON_VERSION:=0.14
 LIBDAEMON_SOURCE:=libdaemon-$(LIBDAEMON_VERSION).tar.gz
 LIBDAEMON_SITE:=http://0pointer.de/lennart/projects/libdaemon/
 LIBDAEMON_AUTORECONF:=no
@@ -12,6 +12,7 @@ LIBDAEMON_INSTALL_STAGING:=YES
 LIBDAEMON_INSTALL_TARGET:=YES
 LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no
 LIBDAEMON_CONF_OPT:=--disable-lynx 
+LIBDAEMON_LIBTOOL_PATCH:=no
 
 LIBDAEMON_DEPENDENCIES:=host-pkg-config
 
diff --git a/package/libdaemon/libdeamon-0.14-buildroot-libtool.patch b/package/libdaemon/libdeamon-0.14-buildroot-libtool.patch
new file mode 100644
index 0000000..5697bf1
--- /dev/null
+++ b/package/libdaemon/libdeamon-0.14-buildroot-libtool.patch
@@ -0,0 +1,53 @@
+--- a/ltmain.sh	2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh	2008-04-30 09:55:28.000000000 -0400
+@@ -2239,8 +2239,11 @@ func_mode_install ()
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  # test "$inst_prefix_dir" = "$destdir" && \
++	  #   func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -5739,8 +5742,14 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
++            # Adding 'libdir' from the .la file to our library search paths
++            # breaks crosscompilation horribly.  We cheat here and don't add
++            # it, instead adding the path where we found the .la.  -CL
++	    dir="$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	    #dir="$libdir"
++	    #absdir="$libdir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -5891,7 +5900,7 @@ func_mode_link ()
+ 	  *)
+ 	    if test "$installed" = no; then
+ 	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=yes
++	      need_relink=no
+ 	    fi
+ 	    ;;
+ 	  esac
+@@ -8373,6 +8382,10 @@ func_mode_link ()
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++              # Replacing uninstalled with installed can easily break crosscompilation,
++              # since the installed path is generally the wrong architecture.  -CL
++              newdependency_libs="$newdependency_libs $deplib"
++              continue
+ 	      case $deplib in
+ 	      *.la)
+ 		func_basename "$deplib"
-- 
1.7.2.3

[Buildroot] [PATCH 11/21] libelf: bump to 0.8.13

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                  |    2 +-
 package/libelf/libelf.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e2fa369..e541b7e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
-	gmp, iptables, kismet, libdeamon, openvpn, qt, usbutils
+	gmp, iptables, kismet, libdeamon, libelf, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 2a7d066..eb1a1ad 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -3,7 +3,7 @@
 # libelf
 #
 #############################################################
-LIBELF_VERSION=0.8.12
+LIBELF_VERSION=0.8.13
 LIBELF_SOURCE=libelf-$(LIBELF_VERSION).tar.gz
 LIBELF_SITE=http://www.mr511.de/software/
 LIBELF_INSTALL_STAGING = YES
-- 
1.7.2.3

[Buildroot] [PATCH 12/21] libogg: bump to 1.2.0

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    3 +-
 .../libogg/libogg-1.2.0-buildroot-libtool.patch    |   53 ++++++++++++++++++++
 package/multimedia/libogg/libogg.mk                |    3 +-
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.patch

diff --git a/CHANGES b/CHANGES
index e541b7e..81e0834 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,8 @@
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
-	gmp, iptables, kismet, libdeamon, libelf, openvpn, qt, usbutils
+	gmp, iptables, kismet, libdeamon, libelf, libogg, openvpn, qt,
+	usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.patch b/package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.patch
new file mode 100644
index 0000000..5697bf1
--- /dev/null
+++ b/package/multimedia/libogg/libogg-1.2.0-buildroot-libtool.patch
@@ -0,0 +1,53 @@
+--- a/ltmain.sh	2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh	2008-04-30 09:55:28.000000000 -0400
+@@ -2239,8 +2239,11 @@ func_mode_install ()
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  # test "$inst_prefix_dir" = "$destdir" && \
++	  #   func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -5739,8 +5742,14 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
++            # Adding 'libdir' from the .la file to our library search paths
++            # breaks crosscompilation horribly.  We cheat here and don't add
++            # it, instead adding the path where we found the .la.  -CL
++	    dir="$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	    #dir="$libdir"
++	    #absdir="$libdir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -5891,7 +5900,7 @@ func_mode_link ()
+ 	  *)
+ 	    if test "$installed" = no; then
+ 	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=yes
++	      need_relink=no
+ 	    fi
+ 	    ;;
+ 	  esac
+@@ -8373,6 +8382,10 @@ func_mode_link ()
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++              # Replacing uninstalled with installed can easily break crosscompilation,
++              # since the installed path is generally the wrong architecture.  -CL
++              newdependency_libs="$newdependency_libs $deplib"
++              continue
+ 	      case $deplib in
+ 	      *.la)
+ 		func_basename "$deplib"
diff --git a/package/multimedia/libogg/libogg.mk b/package/multimedia/libogg/libogg.mk
index 02b1976..406de05 100644
--- a/package/multimedia/libogg/libogg.mk
+++ b/package/multimedia/libogg/libogg.mk
@@ -3,12 +3,13 @@
 # libogg
 #
 #############################################################
-LIBOGG_VERSION = 1.1.4
+LIBOGG_VERSION = 1.2.0
 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 LIBOGG_AUTORECONF = NO
 LIBOGG_INSTALL_STAGING = YES
 LIBOGG_INSTALL_TARGET = YES
+LIBOGG_LIBTOOL_PATCH = no
 
 LIBOGG_DEPENDENCIES = host-pkg-config
 
-- 
1.7.2.3

[Buildroot] [PATCH 13/21] libvorbis: bump to 1.3.1

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    4 +-
 .../libvorbis-1.3.1-buildroot-libtool.patch        |   53 ++++++++++++++++++++
 package/multimedia/libvorbis/libvorbis.mk          |    3 +-
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 package/multimedia/libvorbis/libvorbis-1.3.1-buildroot-libtool.patch

diff --git a/CHANGES b/CHANGES
index 81e0834..3412924 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,8 +9,8 @@
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
-	gmp, iptables, kismet, libdeamon, libelf, libogg, openvpn, qt,
-	usbutils
+	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis,
+	openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/multimedia/libvorbis/libvorbis-1.3.1-buildroot-libtool.patch b/package/multimedia/libvorbis/libvorbis-1.3.1-buildroot-libtool.patch
new file mode 100644
index 0000000..5697bf1
--- /dev/null
+++ b/package/multimedia/libvorbis/libvorbis-1.3.1-buildroot-libtool.patch
@@ -0,0 +1,53 @@
+--- a/ltmain.sh	2006-03-11 13:49:04.000000000 -0500
++++ b/ltmain.sh	2008-04-30 09:55:28.000000000 -0400
+@@ -2239,8 +2239,11 @@ func_mode_install ()
+ 	  # At present, this check doesn't affect windows .dll's that
+ 	  # are installed into $libdir/../bin (currently, that works fine)
+ 	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
++	  #
++	  # This breaks install into our staging area.  -PB
++	  #
++	  # test "$inst_prefix_dir" = "$destdir" && \
++	  #   func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+ 	    # Stick the inst_prefix_dir data into the link command.
+@@ -5739,8 +5742,14 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
++            # Adding 'libdir' from the .la file to our library search paths
++            # breaks crosscompilation horribly.  We cheat here and don't add
++            # it, instead adding the path where we found the .la.  -CL
++	    dir="$abs_ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
++	    #dir="$libdir"
++	    #absdir="$libdir"
+ 	  fi
+ 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ 	else
+@@ -5891,7 +5900,7 @@ func_mode_link ()
+ 	  *)
+ 	    if test "$installed" = no; then
+ 	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=yes
++	      need_relink=no
+ 	    fi
+ 	    ;;
+ 	  esac
+@@ -8373,6 +8382,10 @@ func_mode_link ()
+ 	    # Replace all uninstalled libtool libraries with the installed ones
+ 	    newdependency_libs=
+ 	    for deplib in $dependency_libs; do
++              # Replacing uninstalled with installed can easily break crosscompilation,
++              # since the installed path is generally the wrong architecture.  -CL
++              newdependency_libs="$newdependency_libs $deplib"
++              continue
+ 	      case $deplib in
+ 	      *.la)
+ 		func_basename "$deplib"
diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk
index 9a060d9..e735b52 100644
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
@@ -4,12 +4,13 @@
 #
 #############################################################
 
-LIBVORBIS_VERSION = 1.2.3
+LIBVORBIS_VERSION = 1.3.1
 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
 LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
 LIBVORBIS_AUTORECONF = NO
 LIBVORBIS_INSTALL_STAGING = YES
 LIBVORBIS_INSTALL_TARGET = YES
+LIBVORBIS_LIBTOOL_PATCH = no
 
 LIBVORBIS_CONF_OPT = --disable-oggtest
 
-- 
1.7.2.3

[Buildroot] [PATCH 14/21] make: bump to 3.82

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES              |    2 +-
 package/make/make.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3412924..aaffd26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@
 
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
-	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis,
+	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis, make,
 	openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
diff --git a/package/make/make.mk b/package/make/make.mk
index 12d236a..6beccf3 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -3,7 +3,7 @@
 # make
 #
 #############################################################
-MAKE_VERSION:=3.81
+MAKE_VERSION:=3.82
 MAKE_SOURCE:=make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE:=$(BR2_GNU_MIRROR)/make
 
-- 
1.7.2.3

[Buildroot] [PATCH 15/21] module-init-tools: bump to 3.12

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                        |    2 +-
 package/module-init-tools/module-init-tools.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index aaffd26..9c89f65 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
 	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis, make,
-	openvpn, qt, usbutils
+	module-init-tools, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index 5dfdaad..27d0159 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -3,7 +3,7 @@
 # module-init-tools
 #
 #############################################################
-MODULE_INIT_TOOLS_VERSION=3.11
+MODULE_INIT_TOOLS_VERSION=3.12
 MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
 MODULE_INIT_TOOLS_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
 MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
-- 
1.7.2.3

[Buildroot] [PATCH 16/21] mpfr: bump to 3.0.0

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES              |    2 +-
 package/mpfr/mpfr.mk |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9c89f65..b17b716 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
 	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis, make,
-	module-init-tools, openvpn, qt, usbutils
+	module-init-tools, mpfr, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index a7834dd..ebaa91c 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -3,8 +3,8 @@
 # mpfr
 #
 #############################################################
-MPFR_VERSION:=2.4.1
-MPFR_PATCH:=patches
+MPFR_VERSION:=3.0.0
+MPFR_PATCH:=allpatches
 MPFR_PATCH_FILE:=mpfr-$(MPFR_VERSION).patch
 MPFR_SOURCE:=mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_CAT:=$(BZCAT)
@@ -13,7 +13,7 @@ MPFR_DIR:=$(TOOLCHAIN_DIR)/mpfr-$(MPFR_VERSION)
 MPFR_TARGET_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION)
 MPFR_BINARY:=libmpfr$(LIBTGTEXT)
 MPFR_HOST_BINARY:=libmpfr$(HOST_LIBEXT)
-MPFR_LIBVERSION:=1.2.0
+MPFR_LIBVERSION:=4.0.0
 
 # need patch
 ifneq ($(MPFR_PATCH),)
-- 
1.7.2.3

[Buildroot] [PATCH 17/21] nano: bump to 2.2.5

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES              |    2 +-
 package/nano/nano.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b17b716..0b2a6a5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
 	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis, make,
-	module-init-tools, mpfr, openvpn, qt, usbutils
+	module-init-tools, mpfr, nano, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 3e8ba50..e88fda6 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NANO_VERSION = 2.2.3
+NANO_VERSION = 2.2.5
 NANO_SITE = http://www.nano-editor.org/dist/v2.2
 NANO_MAKE_ENV = CURSES_LIB="-lncurses"
 NANO_CONF_OPT = --without-slang --enable-tiny
-- 
1.7.2.3

[Buildroot] [PATCH 18/21] ntp: convert to autotargets and bump to 4.2.6p2

[Martin Banky]

Also added additional options for ntp and fixed a build issue when IPv6 support
is not available.

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                 |    2 +-
 package/ntp/Config.in                   |   44 +++++++
 package/ntp/ntp-4.2.4_p5-adjtimex.patch |   33 ------
 package/ntp/ntp-4.2.4_p5-nano.patch     |   36 ------
 package/ntp/ntp-4.2.6_p2-adjtimex.patch |   33 ++++++
 package/ntp/ntp-optional-ipv6.patch     |   24 ----
 package/ntp/ntp.mk                      |  192 +++++++++++++++++++-----------
 7 files changed, 199 insertions(+), 165 deletions(-)
 delete mode 100644 package/ntp/ntp-4.2.4_p5-adjtimex.patch
 delete mode 100644 package/ntp/ntp-4.2.4_p5-nano.patch
 create mode 100644 package/ntp/ntp-4.2.6_p2-adjtimex.patch
 delete mode 100644 package/ntp/ntp-optional-ipv6.patch

diff --git a/CHANGES b/CHANGES
index 0b2a6a5..e4e185c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
 	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis, make,
-	module-init-tools, mpfr, nano, openvpn, qt, usbutils
+	module-init-tools, mpfr, nano, ntp, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index 6213141..1666503 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -11,3 +11,47 @@ config BR2_PACKAGE_NTP_SNTP
 	depends on BR2_PACKAGE_NTP
 	help
 	  Simple network time protocol program
+	  
+config BR2_PACKAGE_NTP_NTP-KEYGEN
+	bool "ntp-keygen"
+	depends on BR2_PACKAGE_NTP
+	help
+	  Create a NTP host key
+	  
+config BR2_PACKAGE_NTP_NTP-WAIT
+	bool "ntp-wait"
+	select BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_NTP
+	help
+	  ntp-wait waits until the locally running ntpd is in state 4
+	  (synchronized). This could be useful at boot time, to delay the
+	  boot sequence until after "ntpd -g" has set the time.
+	  
+config BR2_PACKAGE_NTP_NTPDC
+	bool "ntpdc"
+	depends on BR2_PACKAGE_NTP
+	help
+	  The ntpdc utility program is used to query an NTP daemon about
+	  its current state and to request changes in that state.
+	  
+config BR2_PACKAGE_NTP_NTPQ
+	bool "ntpq"
+	depends on BR2_PACKAGE_NTP
+	help
+	  The ntpq utility program is used to query NTP servers requesting
+	  information about current state and/or changes in that state.
+	  
+config BR2_PACKAGE_NTP_NTPTRACE
+	bool "ntptrace"
+	select BR2_PACKAGE_MICROPERL
+	depends on BR2_PACKAGE_NTP
+	help
+	  ntptrace is a perl script that uses the ntpq utility program to
+	  follow the chain of NTP servers from a given host back to the
+	  primary time source
+	  
+config BR2_PACKAGE_NTP_TICKADJ
+	bool "tickadj"
+	depends on BR2_PACKAGE_NTP
+	help
+	  set time-related kernel variables
diff --git a/package/ntp/ntp-4.2.4_p5-adjtimex.patch b/package/ntp/ntp-4.2.4_p5-adjtimex.patch
deleted file mode 100644
index 40625fa..0000000
--- a/package/ntp/ntp-4.2.4_p5-adjtimex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://support.ntp.org/bugs/show_bug.cgi?id=769
-http://bugs.gentoo.org/254030
-
---- ntp/util/tickadj.c
-+++ ntp/util/tickadj.c
-@@ -21,7 +21,8 @@
- # include <unistd.h>
- #endif /* HAVE_UNISTD_H */
- 
--#ifdef HAVE___ADJTIMEX		/* Linux */
-+/* proper handling here has been moved to upstream ntp bugzilla */
-+#ifdef linux
- 
- #include <sys/timex.h>
- struct timex txc;
-@@ -91,7 +92,7 @@
- 	}
- 
- 	if (!errflg) {
--		if (__adjtimex(&txc) < 0)
-+		if (adjtimex(&txc) < 0)
- 			perror("adjtimex");
- 		else if (!quiet)
- 			printf("tick     = %ld\ntick_adj = %d\n",
-@@ -146,7 +147,7 @@
- #endif
- 	}
-     
--	if (__adjtimex(&txc) < 0)
-+	if (adjtimex(&txc) < 0)
- 	{
- 		perror("adjtimex");
- 	}
diff --git a/package/ntp/ntp-4.2.4_p5-nano.patch b/package/ntp/ntp-4.2.4_p5-nano.patch
deleted file mode 100644
index f4097ee..0000000
--- a/package/ntp/ntp-4.2.4_p5-nano.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fixes the MOD_NANO build failure
-
-ntp_loopfilter.c: In function 'local_clock':
-ntp_loopfilter.c:571: error: 'MOD_NANO' undeclared (first use in this function)
-ntp_loopfilter.c:571: error: (Each undeclared identifier is reported only once
-ntp_loopfilter.c:571: error: for each function it appears in.)
-ntp_loopfilter.c: In function 'loop_config':
-ntp_loopfilter.c:896: error: 'MOD_NANO' undeclared (first use in this function)
-
-Taken from
-http://cvs.fedoraproject.org/viewvc/devel/ntp/ntp-4.2.4p7-nano.patch?revision=1.1&content-type=text/plain&view=co
-
-See the discussion at
-https://bugs.launchpad.net/ubuntu/+source/ntp/+bug/412242 for more
-details and links. The below fix is not a correct fix, but only a
-workaround. The real fix required changes to kernel/libc headers.
-
-Index: ntp-4.2.4p5/include/ntp_syscall.h
-===================================================================
---- ntp-4.2.4p5.orig/include/ntp_syscall.h	2010-05-14 17:34:48.000000000 +0200
-+++ ntp-4.2.4p5/include/ntp_syscall.h	2010-05-14 17:35:13.000000000 +0200
-@@ -14,6 +14,14 @@
- # include <sys/timex.h>
- #endif
- 
-+#if defined(ADJ_NANO) && !defined(MOD_NANO)
-+#define MOD_NANO ADJ_NANO
-+#endif
-+
-+#if defined(ADJ_TAI) && !defined(MOD_TAI)
-+#define MOD_TAI ADJ_TAI
-+#endif
-+
- #ifndef NTP_SYSCALLS_LIBC
- #ifdef NTP_SYSCALLS_STD
- # define ntp_adjtime(t)		syscall(SYS_ntp_adjtime, (t))
diff --git a/package/ntp/ntp-4.2.6_p2-adjtimex.patch b/package/ntp/ntp-4.2.6_p2-adjtimex.patch
new file mode 100644
index 0000000..40625fa
--- /dev/null
+++ b/package/ntp/ntp-4.2.6_p2-adjtimex.patch
@@ -0,0 +1,33 @@
+https://support.ntp.org/bugs/show_bug.cgi?id=769
+http://bugs.gentoo.org/254030
+
+--- ntp/util/tickadj.c
++++ ntp/util/tickadj.c
+@@ -21,7 +21,8 @@
+ # include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+ 
+-#ifdef HAVE___ADJTIMEX		/* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+ 
+ #include <sys/timex.h>
+ struct timex txc;
+@@ -91,7 +92,7 @@
+ 	}
+ 
+ 	if (!errflg) {
+-		if (__adjtimex(&txc) < 0)
++		if (adjtimex(&txc) < 0)
+ 			perror("adjtimex");
+ 		else if (!quiet)
+ 			printf("tick     = %ld\ntick_adj = %d\n",
+@@ -146,7 +147,7 @@
+ #endif
+ 	}
+     
+-	if (__adjtimex(&txc) < 0)
++	if (adjtimex(&txc) < 0)
+ 	{
+ 		perror("adjtimex");
+ 	}
diff --git a/package/ntp/ntp-optional-ipv6.patch b/package/ntp/ntp-optional-ipv6.patch
deleted file mode 100644
index 20d6edf..0000000
--- a/package/ntp/ntp-optional-ipv6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] ntpd: fix build without ipv6 support
-
-ntp_io.c was checkin the non-existing DISABLE_IPV6 define rather
-than WANT_IPV6 as defined in config.h, breaking the build if
-the toolchain doesn't have ipv6 support.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- ntpd/ntp_io.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ntp-4.2.4p5/ntpd/ntp_io.c
-===================================================================
---- ntp-4.2.4p5.orig/ntpd/ntp_io.c
-+++ ntp-4.2.4p5/ntpd/ntp_io.c
-@@ -55,7 +55,7 @@
-  * Set up some macros to look for IPv6 and IPv6 multicast
-  */
- 
--#if defined(ISC_PLATFORM_HAVEIPV6) && !defined(DISABLE_IPV6)
-+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
- 
- #define INCLUDE_IPV6_SUPPORT
- 
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 78a4d2c..811c082 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -3,91 +3,141 @@
 # ntp
 #
 #############################################################
-NTP_VERSION:=4.2.4p5
-NTP_SOURCE:=ntp-$(NTP_VERSION).tar.gz
-NTP_SITE:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
-NTP_DIR:=$(BUILD_DIR)/ntp-$(NTP_VERSION)
-NTP_CAT:=$(ZCAT)
-NTP_BINARY:=ntpdate/ntpdate
-NTP_TARGET_BINARY:=usr/bin/ntpdate
-
-$(DL_DIR)/$(NTP_SOURCE):
-	$(call DOWNLOAD,$(NTP_SITE),$(NTP_SOURCE))
-
-ntp-source: $(DL_DIR)/$(NTP_SOURCE)
-
-$(NTP_DIR)/.patched: $(DL_DIR)/$(NTP_SOURCE)
-	$(NTP_CAT) $(DL_DIR)/$(NTP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(NTP_DIR) package/ntp/ ntp\*.patch
-	$(SED) "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," \
-		$(NTP_DIR)/ntpd/refclock_pcf.c
-	$(SED) '/[[:space:](]index[[:space:]]*(/s/[[:space:]]*index[[:space:]]*(/ strchr(/g' $(NTP_DIR)/libisc/*.c $(NTP_DIR)/arlib/sample.c
-	$(SED) '/[[:space:](]rindex[[:space:]]*(/s/[[:space:]]*rindex[[:space:]]*(/ strrchr(/g' $(NTP_DIR)/ntpd/*.c
-	#$(SED) 's/\(^#[[:space:]]*include[[:space:]]*<sys\/var.h>\)/\/\/ \1/' $(NTP_DIR)/util/tickadj.c
-	$(CONFIG_UPDATE) $(NTP_DIR)
-	$(CONFIG_UPDATE) $(NTP_DIR)/sntp
-	touch $@
-
-$(NTP_DIR)/.configured: $(NTP_DIR)/.patched
-	(cd $(NTP_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		ac_cv_lib_md5_MD5Init=no \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(DISABLE_NLS) \
-		$(DISABLE_IPV6) \
-		--with-shared \
+NTP_VERSION = 4.2.6p2
+NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
+NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
+NTP_DIR = $(BUILD_DIR)/ntp-$(NTP_VERSION)
+NTP_CAT = $(ZCAT)
+
+NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
+
+ifneq ($(BR2_INET_IPV6),y)
+NTP_CONF_ENV += isc_cv_have_in6addr_any=no
+endif
+
+NTP_CONF_OPT = --with-shared \
 		--program-transform-name=s,,, \
 		--without-crypto \
-		--disable-tickadj \
-	)
-	touch $@
+		--disable-tickadj
 
-$(NTP_DIR)/$(NTP_BINARY): $(NTP_DIR)/.configured
-	$(MAKE) -C $(NTP_DIR)
+define NTP_PATCH_FIXUPS
+	$(SED) "s,^#if.*__GLIBC__.*_BSD_SOURCE.*$$,#if 0," $(NTP_DIR)/ntpd/refclock_pcf.c
+	$(SED) '/[[:space:](]rindex[[:space:]]*(/s/[[:space:]]*rindex[[:space:]]*(/ strrchr(/g' $(NTP_DIR)/ntpd/*.c
+endef
 
-$(TARGET_DIR)/$(NTP_TARGET_BINARY): $(NTP_DIR)/$(NTP_BINARY)
-	install -m 755 $(NTP_DIR)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
-	install -m 755 $(NTP_DIR)/$(NTP_BINARY) $(TARGET_DIR)/$(NTP_TARGET_BINARY)
 ifeq ($(BR2_PACKAGE_NTP_SNTP),y)
+define NTP_INSTALL_SNTP
 	install -m 755 $(NTP_DIR)/sntp/sntp $(TARGET_DIR)/usr/bin/sntp
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTP-KEYGEN),y)
+define NTP_INSTALL_NTP-KEYGEN
+	install -m 755 $(NTP_DIR)/util/ntp-keygen $(TARGET_DIR)/usr/bin/ntp-keygen
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTP-WAIT),y)
+define NTP_INSTALL_NTP-WAIT
+	install -m 755 $(NTP_DIR)/scripts/ntp-wait $(TARGET_DIR)/usr/bin/ntp-wait
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTPDC),y)
+define NTP_INSTALL_NTPDC
+	install -m 755 $(NTP_DIR)/ntpdc/ntpdc $(TARGET_DIR)/usr/bin/ntpdc
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTPQ),y)
+define NTP_INSTALL_NTPQ
+	install -m 755 $(NTP_DIR)/ntpq/ntpq $(TARGET_DIR)/usr/bin/ntpq
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTPTRACE),y)
+define NTP_INSTALL_NTPTRACE
+	install -m 755 $(NTP_DIR)/scripts/ntptrace $(TARGET_DIR)/usr/bin/ntptrace
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_TICKADJ),y)
+define NTP_INSTALL_TICKADJ
+	install -m 755 $(NTP_DIR)/util/tickadj $(TARGET_DIR)/usr/bin/tickadj
+endef
 endif
+
+define NTP_INSTALL_TARGET_CMDS
+	install -m 755 $(NTP_DIR)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
+	$(NTP_INSTALL_SNTP)
+	$(NTP_INSTALL_NTP-KEYGEN)
+	$(NTP_INSTALL_NTP-WAIT)
+	$(NTP_INSTALL_NTPDC)
+	$(NTP_INSTALL_NTPQ)
+	$(NTP_INSTALL_NTPTRACE)
+	$(NTP_INSTALL_TICKADJ)
 	install -m 755 package/ntp/ntp.sysvinit $(TARGET_DIR)/etc/init.d/S49ntp
 	@if [ ! -f $(TARGET_DIR)/etc/default/ntpd ]; then \
 		install -m 755 -d $(TARGET_DIR)/etc/default ; \
 		install -m 644 package/ntp/ntpd.etc.default $(TARGET_DIR)/etc/default/ntpd ; \
 	fi
+endef
 
-ntp: $(TARGET_DIR)/$(NTP_TARGET_BINARY)
+ifeq ($(BR2_PACKAGE_NTP_SNTP),y)
+define NTP_UNINSTALL_SNTP
+	rm $(TARGET_DIR)/usr/bin/sntp
+endef
+endif
 
-ntp-clean:
-	rm -f $(TARGET_DIR)/usr/sbin/ntpd $(TARGET_DIR)/usr/bin/sntp \
-		$(TARGET_DIR)/etc/init.d/S49ntp \
-		$(TARGET_DIR)/$(NTP_TARGET_BINARY)
-	-$(MAKE) -C $(NTP_DIR) clean
+ifeq ($(BR2_PACKAGE_NTP_NTP-KEYGEN),y)
+define NTP_UNINSTALL_NTP-KEYGEN
+	rm $(TARGET_DIR)/usr/bin/ntp-keygen
+endef
+endif
 
-ntp-dirclean:
-	rm -rf $(NTP_DIR)
+ifeq ($(BR2_PACKAGE_NTP_NTP-WAIT),y)
+define NTP_UNINSTALL_NTP-WAIT
+	rm $(TARGET_DIR)/usr/bin/ntp-wait
+endef
+endif
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NTP),y)
-TARGETS+=ntp
+ifeq ($(BR2_PACKAGE_NTP_NTPDC),y)
+define NTP_UNINSTALL_NTPDC
+	rm $(TARGET_DIR)/usr/bin/ntpdc
+endef
 endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTPQ),y)
+define NTP_UNINSTALL_NTPQ
+	rm $(TARGET_DIR)/usr/bin/ntpq
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_NTPTRACE),y)
+define NTP_UNINSTALL_NTPTRACE
+	rm $(TARGET_DIR)/usr/bin/ntptrace
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_NTP_TICKADJ),y)
+define NTP_UNINSTALL_TICKADJ
+	rm $(TARGET_DIR)/usr/bin/tickadj
+endef
+endif
+
+define NTP_UNINSTALL_TARGET_CMDS
+	rm $(TARGET_DIR)/usr/sbin/ntpd
+	$(NTP_UNINSTALL_SNTP)
+	$(NTP_UNINSTALL_NTP-KEYGEN)
+	$(NTP_UNINSTALL_NTP-WAIT)
+	$(NTP_UNINSTALL_NTPDC)
+	$(NTP_UNINSTALL_NTPQ)
+	$(NTP_UNINSTALL_NTPTRACE)
+	$(NTP_UNINSTALL_TICKADJ)
+	rm $(TARGET_DIR)/etc/init.d/S49ntp
+	rm $(TARGET_DIR)/etc/default/ntpd
+endef
+
+NTP_POST_PATCH_HOOKS += NTP_PATCH_FIXUPS
+
+$(eval $(call AUTOTARGETS,package,ntp))
-- 
1.7.2.3

[Buildroot] [PATCH 19/21] openssl: bump to 1.0.0a

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 CHANGES                                            |    2 +-
 .../openssl/openssl-1.0.0a-do-not-build-docs.patch |   13 +++++
 .../openssl-1.0.0a-dont-force-large-file.patch     |   19 +++++++
 package/openssl/openssl-1.0.0a-optional-ipv6.patch |   20 +++++++
 package/openssl/openssl-do-not-build-docs.patch    |   13 -----
 .../openssl/openssl-dont-force-large-file.patch    |   19 -------
 package/openssl/openssl-nofips.patch               |   12 ----
 package/openssl/openssl-optional-ipv6.patch        |   55 --------------------
 package/openssl/openssl-uclibc-susv3-legacy.patch  |   18 ------
 package/openssl/openssl.mk                         |   11 ++--
 10 files changed, 58 insertions(+), 124 deletions(-)
 create mode 100644 package/openssl/openssl-1.0.0a-do-not-build-docs.patch
 create mode 100644 package/openssl/openssl-1.0.0a-dont-force-large-file.patch
 create mode 100644 package/openssl/openssl-1.0.0a-optional-ipv6.patch
 delete mode 100644 package/openssl/openssl-do-not-build-docs.patch
 delete mode 100644 package/openssl/openssl-dont-force-large-file.patch
 delete mode 100644 package/openssl/openssl-nofips.patch
 delete mode 100644 package/openssl/openssl-optional-ipv6.patch
 delete mode 100644 package/openssl/openssl-uclibc-susv3-legacy.patch

diff --git a/CHANGES b/CHANGES
index e4e185c..5f710b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@
 	Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
 	berkeleydb, bison, busybox, ccache, dropbear, fakeroot, genext2fs,
 	gmp, iptables, kismet, libdeamon, libelf, libogg, libvorbis, make,
-	module-init-tools, mpfr, nano, ntp, openvpn, qt, usbutils
+	module-init-tools, mpfr, nano, ntp, openssl, openvpn, qt, usbutils
 
 	Removed packages: dillo, libglib12, libgtk12, microwin, pcmcia
 
diff --git a/package/openssl/openssl-1.0.0a-do-not-build-docs.patch b/package/openssl/openssl-1.0.0a-do-not-build-docs.patch
new file mode 100644
index 0000000..329efbe
--- /dev/null
+++ b/package/openssl/openssl-1.0.0a-do-not-build-docs.patch
@@ -0,0 +1,13 @@
+Dont waste time building manpages if we're not going to use em.
+
+--- openssl/Makefile.org
++++ openssl/Makefile.org
+@@ -492,7 +492,7 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: all install_sw
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
diff --git a/package/openssl/openssl-1.0.0a-dont-force-large-file.patch b/package/openssl/openssl-1.0.0a-dont-force-large-file.patch
new file mode 100644
index 0000000..5b04656
--- /dev/null
+++ b/package/openssl/openssl-1.0.0a-dont-force-large-file.patch
@@ -0,0 +1,19 @@
+[patch]: bss_file.c: don't force largefile mode
+---
+ crypto/bio/bss_file.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: openssl-0.9.8g/crypto/bio/bss_file.c
+===================================================================
+--- openssl-0.9.8g.orig/crypto/bio/bss_file.c
++++ openssl-0.9.8g/crypto/bio/bss_file.c
+@@ -78,9 +78,6 @@
+  * sequential access of large files without extra "magic" comprise *BSD,
+  * Darwin, IRIX...
+  */
+-#ifndef _FILE_OFFSET_BITS
+-#define _FILE_OFFSET_BITS 64
+-#endif
+ #endif
+ 
+ #include <stdio.h>
diff --git a/package/openssl/openssl-1.0.0a-optional-ipv6.patch b/package/openssl/openssl-1.0.0a-optional-ipv6.patch
new file mode 100644
index 0000000..667d00f
--- /dev/null
+++ b/package/openssl/openssl-1.0.0a-optional-ipv6.patch
@@ -0,0 +1,20 @@
+[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,8 @@
+ 
+ #include <stdio.h>
+ #include <errno.h>
++#include <features.h>
++
+ #define USE_SOCKETS
+ #include "cryptlib.h"
+ 
diff --git a/package/openssl/openssl-do-not-build-docs.patch b/package/openssl/openssl-do-not-build-docs.patch
deleted file mode 100644
index 135a9d3..0000000
--- a/package/openssl/openssl-do-not-build-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Dont waste time building manpages if we're not going to use em.
-
---- openssl/Makefile.org
-+++ openssl/Makefile.org
-@@ -792,7 +792,7 @@
- dist_pem_h:
- 	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
- 
--install: all install_docs install_sw
-+install: all install_sw
- 
- install_sw:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
diff --git a/package/openssl/openssl-dont-force-large-file.patch b/package/openssl/openssl-dont-force-large-file.patch
deleted file mode 100644
index 5b04656..0000000
--- a/package/openssl/openssl-dont-force-large-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-[patch]: bss_file.c: don't force largefile mode
----
- crypto/bio/bss_file.c |    3 ---
- 1 file changed, 3 deletions(-)
-
-Index: openssl-0.9.8g/crypto/bio/bss_file.c
-===================================================================
---- openssl-0.9.8g.orig/crypto/bio/bss_file.c
-+++ openssl-0.9.8g/crypto/bio/bss_file.c
-@@ -78,9 +78,6 @@
-  * sequential access of large files without extra "magic" comprise *BSD,
-  * Darwin, IRIX...
-  */
--#ifndef _FILE_OFFSET_BITS
--#define _FILE_OFFSET_BITS 64
--#endif
- #endif
- 
- #include <stdio.h>
diff --git a/package/openssl/openssl-nofips.patch b/package/openssl/openssl-nofips.patch
deleted file mode 100644
index 0edea3e..0000000
--- 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 2876058..0000000
--- 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 eb1d277..0000000
--- 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 edbfe8b..ebf4fb1 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -3,7 +3,8 @@
 # openssl
 #
 #############################################################
-OPENSSL_VERSION:=0.9.8o
+OPENSSL_VERSION:=1.0.0a
+OPENSSL_SOURCE = openssl-$(OPENSSL_VERSION).tar.gz
 OPENSSL_SITE:=http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib
@@ -32,10 +33,8 @@ define OPENSSL_CONFIGURE_CMDS
 			threads \
 			shared \
 			no-idea \
+			no-mdc2 \
 			no-rc5 \
-			enable-camellia \
-			enable-mdc2 \
-			enable-tlsext \
 			zlib-dynamic \
 	)
 	$(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile
@@ -43,8 +42,8 @@ define OPENSSL_CONFIGURE_CMDS
 endef
 
 define OPENSSL_BUILD_CMDS
-	$(MAKE1) -C $(@D) all build-shared
-	$(MAKE1) -C $(@D) do_linux-shared
+	$(MAKE1) CC="$(TARGET_CC)" -C $(@D) all build-shared
+	$(MAKE1) CC="$(TARGET_CC)" -C $(@D) do_linux-shared
 endef
 
 define OPENSSL_INSTALL_STAGING_CMDS
-- 
1.7.2.3

[Buildroot] [PATCH 20/21] BugFix - Bison - Fixed Missing stddef.h Include In wchar.h

[Martin Banky]

When uClibc is configured without wchar support, wchar_t define is missing.
When configure runs it includes stddef.h, but when the build runs it does not.

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 package/bison/bison-no-wchar/bison-no-wchar.patch |   13 +++++++++++++
 package/bison/bison.mk                            |    9 +++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 package/bison/bison-no-wchar/bison-no-wchar.patch

diff --git a/package/bison/bison-no-wchar/bison-no-wchar.patch b/package/bison/bison-no-wchar/bison-no-wchar.patch
new file mode 100644
index 0000000..6888ecf
--- /dev/null
+++ b/package/bison/bison-no-wchar/bison-no-wchar.patch
@@ -0,0 +1,13 @@
+--- bison-2.4.3/lib/wchar.in.h	2010-09-09 23:14:49.000000000 -0700
++++ bison-2.4.3.no.wchar/lib/wchar.in.h	2010-09-09 22:07:49.000000000 -0700
+@@ -72,6 +72,10 @@
+ # @INCLUDE_NEXT@ @NEXT_WCHAR_H@
+ #endif
+ 
++#ifdef __UCLIBC__
++# include <stddef.h>
++#endif
++
+ #undef _GL_ALREADY_INCLUDING_WCHAR_H
+ 
+ #ifndef _GL_WCHAR_H
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 075a078..64304a5 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -6,11 +6,20 @@
 BISON_VERSION:=2.4.3
 BISON_SOURCE:=bison-$(BISON_VERSION).tar.bz2
 BISON_SITE:=$(BR2_GNU_MIRROR)/bison
+BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VERSION)
 
 define BISON_DISABLE_EXAMPLES
 	echo 'all install:' > $(@D)/examples/Makefile
 endef
 
+define BISON_NO_WCHAR_SUPPORT
+	toolchain/patch-kernel.sh $(BISON_DIR) package/bison/bison-no-wchar/ \*.patch
+endef
+
+ifneq ($(BR2_USE_WCHAR),y)
+BISON_POST_CONFIGURE_HOOKS += BISON_NO_WCHAR_SUPPORT
+endif
+
 BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
 
 $(eval $(call AUTOTARGETS,package,bison))
-- 
1.7.2.3

[Buildroot] [PATCH 21/21] BugFix - m4 - Fixed Missing wint_t typedef When There Is No WChar Support

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 package/m4/m4-no-wchar/m4-no-wchar.patch |   20 ++++++++++++++++++++
 package/m4/m4.mk                         |    6 ++++++
 2 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 package/m4/m4-no-wchar/m4-no-wchar.patch

diff --git a/package/m4/m4-no-wchar/m4-no-wchar.patch b/package/m4/m4-no-wchar/m4-no-wchar.patch
new file mode 100644
index 0000000..751d228
--- /dev/null
+++ b/package/m4/m4-no-wchar/m4-no-wchar.patch
@@ -0,0 +1,20 @@
+--- m4-1.4.9/lib/printf-args.h	2010-09-09 23:14:49.000000000 -0700
++++ m4-1.4.9.no.wchar/lib/printf-args.h	2010-09-09 19:09:09.000000000 -0700
+@@ -29,6 +29,7 @@
+ /* Get wint_t.  */
+ #if HAVE_WINT_T
+ # include <wchar.h>
++typedef unsigned int wint_t;
+ #endif
+ 
+ /* Get va_list.  */
+--- m4-1.4.9/lib/wctype_.h	2010-09-09 23:14:49.000000000 -0700
++++ m4-1.4.9.no.wchar/lib/wctype_.h	2010-09-09 19:09:09.000000000 -0700
+@@ -39,6 +39,7 @@
+ # include <stdio.h>
+ # include <time.h>
+ # include <wchar.h>
++typedef unsigned int wint_t;
+ typedef wint_t __wctype_wint_t;
+ #else
+ typedef int __wctype_wint_t;
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index a0b56c4..7392e9d 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -6,6 +6,11 @@
 M4_VERSION = 1.4.9
 M4_SOURCE = m4-$(M4_VERSION).tar.bz2
 M4_SITE = $(BR2_GNU_MIRROR)/m4
+M4_DIR = $(BUILD_DIR)/m4-$(M4_VERSION)
+
+define M4_NO_WCHAR_SUPPORT
+	toolchain/patch-kernel.sh $(M4_DIR) package/m4/m4-no-wchar/ \*.patch
+endef
 
 ifeq ($(BR2_ENABLE_DEBUG),y) # no install-exec
 M4_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
@@ -15,6 +20,7 @@ M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
 
 ifneq ($(BR2_USE_WCHAR),y)
 M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h
+M4_POST_CONFIGURE_HOOKS += M4_NO_WCHAR_SUPPORT
 endif
 
 HOST_M4_CONF_OPT = --disable-static
-- 
1.7.2.3

[Buildroot] [PATCH 04/21] automake: bump to 1.11.1

[Lionel Landwerlin]

I'm still working on a new libtool version to be integrated in buildroot.
Amongst others things, automake 1.10.3 is required. So far I've been
able to build a rootfs including glib/libsoup/gstreamer/directfb with
automake 1.11, so...

Acked-by: Lionel Landwerlin <llandwerlin@gmail.com>

On Tue, Sep 14, 2010 at 5:40 AM, Martin Banky <martin.banky@gmail.com> wrote:
> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
> ---
> ?CHANGES ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
> ?package/automake/automake.mk | ? ?2 +-
> ?2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/CHANGES b/CHANGES
> index 6abd5c0..381e628 100644
> --- a/CHANGES
> +++ b/CHANGES
> @@ -7,7 +7,7 @@
>
> ? ? ? ?Toolchain: ARM cortex A9 support
>
> - ? ? ? Updated/fixed packages: alsa-lib, alsa-utils, autoconf,
> + ? ? ? Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
> ? ? ? ?berkeleydb, busybox, dropbear, iptables, kismet, openvpn, qt,
> ? ? ? ?usbutils
>
> diff --git a/package/automake/automake.mk b/package/automake/automake.mk
> index 46bb773..a7d81ff 100644
> --- a/package/automake/automake.mk
> +++ b/package/automake/automake.mk
> @@ -3,7 +3,7 @@
> ?# automake
> ?#
> ?#############################################################
> -AUTOMAKE_VERSION = 1.10
> +AUTOMAKE_VERSION = 1.11.1
> ?AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
> ?AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
>
> --
> 1.7.2.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>

[Buildroot] [PATCH 20/21] BugFix - Bison - Fixed Missing stddef.h Include In wchar.h

[Thomas Petazzoni]

Hello Martin,

Thanks for your patchset !

On Mon, 13 Sep 2010 20:40:47 -0700
Martin Banky <martin.banky@gmail.com> wrote:

> +BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VERSION)

This is not needed and shouldn't be there.

>  define BISON_DISABLE_EXAMPLES
>  	echo 'all install:' > $(@D)/examples/Makefile
>  endef
>  
> +define BISON_NO_WCHAR_SUPPORT
> +	toolchain/patch-kernel.sh $(BISON_DIR) package/bison/bison-no-wchar/ \*.patch
> +endef
> +
> +ifneq ($(BR2_USE_WCHAR),y)
> +BISON_POST_CONFIGURE_HOOKS += BISON_NO_WCHAR_SUPPORT
> +endif

Personally, I'd prefer not to have patches applied conditionally. It's
the patch itself that should do the right thing depending on whether
wchar support is available or not, so that the patch can eventually be
sent to the upstream project.

Thanks!

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

[Buildroot] [PATCH 20/21] BugFix - Bison - Fixed Missing stddef.h Include In wchar.h

[Martin Banky]

Thomas,
     I'll work on making the changes a little later. I'm in the middle of a
test build for some changes that I'm making in other areas.

Martin

On Tue, Sep 14, 2010 at 12:54 PM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> Hello Martin,
>
> Thanks for your patchset !
>
> On Mon, 13 Sep 2010 20:40:47 -0700
> Martin Banky <martin.banky@gmail.com> wrote:
>
> > +BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VERSION)
>
> This is not needed and shouldn't be there.
>
> >  define BISON_DISABLE_EXAMPLES
> >       echo 'all install:' > $(@D)/examples/Makefile
> >  endef
> >
> > +define BISON_NO_WCHAR_SUPPORT
> > +     toolchain/patch-kernel.sh $(BISON_DIR)
> package/bison/bison-no-wchar/ \*.patch
> > +endef
> > +
> > +ifneq ($(BR2_USE_WCHAR),y)
> > +BISON_POST_CONFIGURE_HOOKS += BISON_NO_WCHAR_SUPPORT
> > +endif
>
> Personally, I'd prefer not to have patches applied conditionally. It's
> the patch itself that should do the right thing depending on whether
> wchar support is available or not, so that the patch can eventually be
> sent to the upstream project.
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100914/6650808a/attachment.html>

[Buildroot] [PATCH 04/21] automake: bump to 1.11.1

[Martin Banky]

Lionel,
     Do you have a public repository that I could pull from or a patch set?
I was just trying to upgrade libtool to 2.2.10, and am having issues. I'd
like to not duplicate work if possible.
Martin

On Tue, Sep 14, 2010 at 1:51 AM, Lionel Landwerlin <llandwerlin@gmail.com>wrote:

> I'm still working on a new libtool version to be integrated in buildroot.
> Amongst others things, automake 1.10.3 is required. So far I've been
> able to build a rootfs including glib/libsoup/gstreamer/directfb with
> automake 1.11, so...
>
> Acked-by: Lionel Landwerlin <llandwerlin@gmail.com>
>
> On Tue, Sep 14, 2010 at 5:40 AM, Martin Banky <martin.banky@gmail.com>
> wrote:
> > Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
> > ---
> >  CHANGES                      |    2 +-
> >  package/automake/automake.mk |    2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/CHANGES b/CHANGES
> > index 6abd5c0..381e628 100644
> > --- a/CHANGES
> > +++ b/CHANGES
> > @@ -7,7 +7,7 @@
> >
> >        Toolchain: ARM cortex A9 support
> >
> > -       Updated/fixed packages: alsa-lib, alsa-utils, autoconf,
> > +       Updated/fixed packages: alsa-lib, alsa-utils, autoconf, automake,
> >        berkeleydb, busybox, dropbear, iptables, kismet, openvpn, qt,
> >        usbutils
> >
> > diff --git a/package/automake/automake.mk b/package/automake/automake.mk
> > index 46bb773..a7d81ff 100644
> > --- a/package/automake/automake.mk
> > +++ b/package/automake/automake.mk
> > @@ -3,7 +3,7 @@
> >  # automake
> >  #
> >  #############################################################
> > -AUTOMAKE_VERSION = 1.10
> > +AUTOMAKE_VERSION = 1.11.1
> >  AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
> >  AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
> >
> > --
> > 1.7.2.3
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100914/2ab15089/attachment-0001.html>

[Buildroot] [PATCH 04/21] automake: bump to 1.11.1

[Lionel Landwerlin]

There is a first try here :

http://git.potipota.net/cgi-bin/cgit.cgi/buildroot/log/?h=new-libtool-at-work

It's based on libtool 2.2.6b, but I'm confident it will work with 2.2.10 too.
It's not finished and should not work very well with packages using
gettext with uclibc.
I've some more work done in private to handle this issue, I could
release it later today/night.

Regards,

--
Lionel Landwerlin

On Wed, Sep 15, 2010 at 4:58 AM, Martin Banky <Martin.Banky@gmail.com> wrote:
> Lionel,
> ???? Do you have a public repository that I could pull from or a patch set?
> I was just trying to upgrade libtool to 2.2.10, and am having issues. I'd
> like to not duplicate work if possible.
> Martin
>
> On Tue, Sep 14, 2010 at 1:51 AM, Lionel Landwerlin <llandwerlin@gmail.com>
> wrote:
>>
>> I'm still working on a new libtool version to be integrated in buildroot.
>> Amongst others things, automake 1.10.3 is required. So far I've been
>> able to build a rootfs including glib/libsoup/gstreamer/directfb with
>> automake 1.11, so...
>>
>> Acked-by: Lionel Landwerlin <llandwerlin@gmail.com>
>>
>> On Tue, Sep 14, 2010 at 5:40 AM, Martin Banky <martin.banky@gmail.com>
>> wrote:
>> > Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
>> > ---
>> > ?CHANGES ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
>> > ?package/automake/automake.mk | ? ?2 +-
>> > ?2 files changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/CHANGES b/CHANGES
>> > index 6abd5c0..381e628 100644
>> > --- a/CHANGES
>> > +++ b/CHANGES
>> > @@ -7,7 +7,7 @@
>> >
>> > ? ? ? ?Toolchain: ARM cortex A9 support
>> >
>> > - ? ? ? Updated/fixed packages: alsa-lib, alsa-utils, autoconf,
>> > + ? ? ? Updated/fixed packages: alsa-lib, alsa-utils, autoconf,
>> > automake,
>> > ? ? ? ?berkeleydb, busybox, dropbear, iptables, kismet, openvpn, qt,
>> > ? ? ? ?usbutils
>> >
>> > diff --git a/package/automake/automake.mk b/package/automake/automake.mk
>> > index 46bb773..a7d81ff 100644
>> > --- a/package/automake/automake.mk
>> > +++ b/package/automake/automake.mk
>> > @@ -3,7 +3,7 @@
>> > ?# automake
>> > ?#
>> > ?#############################################################
>> > -AUTOMAKE_VERSION = 1.10
>> > +AUTOMAKE_VERSION = 1.11.1
>> > ?AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
>> > ?AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
>> >
>> > --
>> > 1.7.2.3
>> >
>> > _______________________________________________
>> > buildroot mailing list
>> > buildroot at busybox.net
>> > http://lists.busybox.net/mailman/listinfo/buildroot
>> >
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>

[Buildroot] [PATCH 04/21] automake: bump to 1.11.1

[Martin Banky]

Lionel,
     Thanks! I'll try it out after I get some sleep, and see how it works.
Martin

On Wed, Sep 15, 2010 at 2:10 AM, Lionel Landwerlin <llandwerlin@gmail.com>wrote:

> There is a first try here :
>
>
> http://git.potipota.net/cgi-bin/cgit.cgi/buildroot/log/?h=new-libtool-at-work
>
> It's based on libtool 2.2.6b, but I'm confident it will work with 2.2.10
> too.
> It's not finished and should not work very well with packages using
> gettext with uclibc.
> I've some more work done in private to handle this issue, I could
> release it later today/night.
>
> Regards,
>
> --
> Lionel Landwerlin
>
> On Wed, Sep 15, 2010 at 4:58 AM, Martin Banky <Martin.Banky@gmail.com>
> wrote:
> > Lionel,
> >      Do you have a public repository that I could pull from or a patch
> set?
> > I was just trying to upgrade libtool to 2.2.10, and am having issues. I'd
> > like to not duplicate work if possible.
> > Martin
> >
> > On Tue, Sep 14, 2010 at 1:51 AM, Lionel Landwerlin <
> llandwerlin at gmail.com>
> > wrote:
> >>
> >> I'm still working on a new libtool version to be integrated in
> buildroot.
> >> Amongst others things, automake 1.10.3 is required. So far I've been
> >> able to build a rootfs including glib/libsoup/gstreamer/directfb with
> >> automake 1.11, so...
> >>
> >> Acked-by: Lionel Landwerlin <llandwerlin@gmail.com>
> >>
> >> On Tue, Sep 14, 2010 at 5:40 AM, Martin Banky <martin.banky@gmail.com>
> >> wrote:
> >> > Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
> >> > ---
> >> >  CHANGES                      |    2 +-
> >> >  package/automake/automake.mk |    2 +-
> >> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >> >
> >> > diff --git a/CHANGES b/CHANGES
> >> > index 6abd5c0..381e628 100644
> >> > --- a/CHANGES
> >> > +++ b/CHANGES
> >> > @@ -7,7 +7,7 @@
> >> >
> >> >        Toolchain: ARM cortex A9 support
> >> >
> >> > -       Updated/fixed packages: alsa-lib, alsa-utils, autoconf,
> >> > +       Updated/fixed packages: alsa-lib, alsa-utils, autoconf,
> >> > automake,
> >> >        berkeleydb, busybox, dropbear, iptables, kismet, openvpn, qt,
> >> >        usbutils
> >> >
> >> > diff --git a/package/automake/automake.mk b/package/automake/
> automake.mk
> >> > index 46bb773..a7d81ff 100644
> >> > --- a/package/automake/automake.mk
> >> > +++ b/package/automake/automake.mk
> >> > @@ -3,7 +3,7 @@
> >> >  # automake
> >> >  #
> >> >  #############################################################
> >> > -AUTOMAKE_VERSION = 1.10
> >> > +AUTOMAKE_VERSION = 1.11.1
> >> >  AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
> >> >  AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
> >> >
> >> > --
> >> > 1.7.2.3
> >> >
> >> > _______________________________________________
> >> > buildroot mailing list
> >> > buildroot at busybox.net
> >> > http://lists.busybox.net/mailman/listinfo/buildroot
> >> >
> >
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100915/735a1410/attachment.html>

[Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23

[Thomas Petazzoni]

Hello Martin,

On Mon, 13 Sep 2010 20:40:28 -0700
Martin Banky <martin.banky@gmail.com> wrote:

> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>

Please don't make any change to the CHANGES file. Those changes are
causing all sort of unnecessary conflicts. Only Peter, Buildroot
maintainer, does the updates to this file.

Could you repost your patch set with all those changes removed ?

Thanks,

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

[Buildroot] [PATCH 05/21] bison: bump to 2.4.3

[Thomas Petazzoni]

On Mon, 13 Sep 2010 20:40:32 -0700
Martin Banky <martin.banky@gmail.com> wrote:

> + 
> + /* Get definitions of 'struct sched_param' and 'sigset_t'.
> +    But avoid namespace pollution on glibc systems.  */
> +-#ifndef __GLIBC__
> ++#if 1

Why ? This seems to contradict the comment above.

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

[Buildroot] [PATCH 09/21] gmp: bump to 5.0.1

[Thomas Petazzoni]

On Mon, 13 Sep 2010 20:40:36 -0700
Martin Banky <martin.banky@gmail.com> wrote:

> +	(cd $(GMP_TARGET_DIR); rm -rf config.cache; cp $(GMP_DIR)/longlong.h $(GMP_DIR)/gmp-impl.h ./; \

Why ? Even if it's really needed, a little bit of explanation in the
commit log would help.

Thanks!

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

[Buildroot] [PATCH 18/21] ntp: convert to autotargets and bump to 4.2.6p2

[Thomas Petazzoni]

Hello !

On Mon, 13 Sep 2010 20:40:45 -0700
Martin Banky <martin.banky@gmail.com> wrote:

> +config BR2_PACKAGE_NTP_NTP-KEYGEN

Please don't use the dash character in configuration options. This
should be BR2_PACKAGE_NTP_KEYGEN or BR2_PACKAGE_NTP_NTP_KEYGEN.

> +NTP_DIR = $(BUILD_DIR)/ntp-$(NTP_VERSION)

Not needed.

> +NTP_CAT = $(ZCAT)

Not needed.

>  ifeq ($(BR2_PACKAGE_NTP_SNTP),y)
> +define NTP_INSTALL_SNTP
>  	install -m 755 $(NTP_DIR)/sntp/sntp $(TARGET_DIR)/usr/bin/sntp
> +endef
> +endif

Instead of $(NTP_DIR), use $(@D).

> +
> +ifeq ($(BR2_PACKAGE_NTP_NTP-KEYGEN),y)
> +define NTP_INSTALL_NTP-KEYGEN
> +	install -m 755 $(NTP_DIR)/util/ntp-keygen $(TARGET_DIR)/usr/bin/ntp-keygen
> +endef
> +endif
> +
> +ifeq ($(BR2_PACKAGE_NTP_NTP-WAIT),y)
> +define NTP_INSTALL_NTP-WAIT
> +	install -m 755 $(NTP_DIR)/scripts/ntp-wait $(TARGET_DIR)/usr/bin/ntp-wait
> +endef
> +endif
> +
> +ifeq ($(BR2_PACKAGE_NTP_NTPDC),y)
> +define NTP_INSTALL_NTPDC
> +	install -m 755 $(NTP_DIR)/ntpdc/ntpdc $(TARGET_DIR)/usr/bin/ntpdc
> +endef
> +endif
> +
> +ifeq ($(BR2_PACKAGE_NTP_NTPQ),y)
> +define NTP_INSTALL_NTPQ
> +	install -m 755 $(NTP_DIR)/ntpq/ntpq $(TARGET_DIR)/usr/bin/ntpq
> +endef
> +endif
> +
> +ifeq ($(BR2_PACKAGE_NTP_NTPTRACE),y)
> +define NTP_INSTALL_NTPTRACE
> +	install -m 755 $(NTP_DIR)/scripts/ntptrace $(TARGET_DIR)/usr/bin/ntptrace
> +endef
> +endif
> +
> +ifeq ($(BR2_PACKAGE_NTP_TICKADJ),y)
> +define NTP_INSTALL_TICKADJ
> +	install -m 755 $(NTP_DIR)/util/tickadj $(TARGET_DIR)/usr/bin/tickadj
> +endef
>  endif
> +
> +define NTP_INSTALL_TARGET_CMDS
> +	install -m 755 $(NTP_DIR)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
> +	$(NTP_INSTALL_SNTP)
> +	$(NTP_INSTALL_NTP-KEYGEN)
> +	$(NTP_INSTALL_NTP-WAIT)
> +	$(NTP_INSTALL_NTPDC)
> +	$(NTP_INSTALL_NTPQ)
> +	$(NTP_INSTALL_NTPTRACE)
> +	$(NTP_INSTALL_TICKADJ)

Humm, you could rewrite this this way:

NTP_INSTALL_BIN_FILES =
ifeq ($(BR2_PACKAGE_NTP_NTP_KEYGEN),y)
NTP_INSTALL_BIN_FILES += util/ntp-keygen
endif
ifeq ($(BR2_PACKAGE_NTP_NTP-WAIT),y)
NTP_INSTALL_BIN_FILES += scripts/ntp-wait
endif
...

and then :

define NTP_INSTALL_TARGET_CMDS
	install -m 755 $(NTP_DIR)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
	test -z "$(NTP_INSTALL_BIN_FILES)" || install -m 755 $(addprefix $(@D),$(NTP_INSTALL_BIN_FILES)) $(TARGET_DIR)/usr/bin/
endif

and finally :

define NTP_UNINSTALL_TARGET_CMDS
	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(NTP_INSTALL_BIN_FILES))
endif

Regards,

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

[Buildroot] [PATCH 01/21] alsa-lib: bump to 1.0.23

[Martin Banky]

Thomas,
     Yes, I kind of figured that out after I started doing some pulls, and
got conflicts regarding the CHANGES file. I'll repost the patch set with the
changes that you asked for.

Martin

On Sat, Sep 18, 2010 at 10:00 AM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> Hello Martin,
>
> On Mon, 13 Sep 2010 20:40:28 -0700
> Martin Banky <martin.banky@gmail.com> wrote:
>
> > Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
>
> Please don't make any change to the CHANGES file. Those changes are
> causing all sort of unnecessary conflicts. Only Peter, Buildroot
> maintainer, does the updates to this file.
>
> Could you repost your patch set with all those changes removed ?
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100918/6fbf1872/attachment.html>

[Buildroot] [PATCH 05/21] bison: bump to 2.4.3

[Martin Banky]

Thomas,
     Sorry, I thought that I had attributed this to the original author, but
alias, I did not. The original author is Michael Deutschmann. See here for
the discussion, http://www.mail-archive.com/uclibc at uclibc.org/msg05169.html.

Martin

On Sat, Sep 18, 2010 at 10:02 AM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> On Mon, 13 Sep 2010 20:40:32 -0700
> Martin Banky <martin.banky@gmail.com> wrote:
>
> > +
> > + /* Get definitions of 'struct sched_param' and 'sigset_t'.
> > +    But avoid namespace pollution on glibc systems.  */
> > +-#ifndef __GLIBC__
> > ++#if 1
>
> Why ? This seems to contradict the comment above.
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100918/2abad883/attachment-0001.html>

[Buildroot] [PATCH 09/21] gmp: bump to 5.0.1

[Martin Banky]

Thomas,
     Per the INSTALL file in mpfr:
"As gmp-impl.h and longlong.h are only in the GMP source directory,
you first need to copy these files to the build directory if it is
different (there may be other workarounds, such as setting $CPPFLAGS
to search the GMP source directory)."
I will change the commit log to reflect this, when I resubmit the patch set
with the other asked for changes.

Martin

On Sat, Sep 18, 2010 at 10:03 AM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> On Mon, 13 Sep 2010 20:40:36 -0700
> Martin Banky <martin.banky@gmail.com> wrote:
>
> > +     (cd $(GMP_TARGET_DIR); rm -rf config.cache; cp
> $(GMP_DIR)/longlong.h $(GMP_DIR)/gmp-impl.h ./; \
>
> Why ? Even if it's really needed, a little bit of explanation in the
> commit log would help.
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100918/333e0d67/attachment.html>

[Buildroot] [PATCH 21/21] BugFix - m4 - Fixed Missing wint_t typedef When There Is No WChar Support

[Peter Korsgaard]

>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:

 Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>

Thanks, but I find this too hackish. M4 is not a package typically
needed on really small systems, so just depending on WCHAR is cleaner
imho.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 21/21] BugFix - m4 - Fixed Missing wint_t typedef When There Is No WChar Support

[Martin Banky]

Peter,
     Not a problem, I just thought I would share my fixes for the type of
system that I'm building. I'm trying to build a target compiler system,
because I have some very complicated builds that I have to do. I have a very
tweaked build of Qt that is hard enough to do in a native environment, let
alone in buildroot. I also have software that I'm developing(at last count
about 15 packages), that would be too much work to convert to buildroot. For
me, it is just easier to have a native compiler to do these things. Also, I
have not had a chance to test the latest version of m4, so maybe that will
fix things. I'll let you know, it's on my todo list.

Martin

On Sun, Sep 19, 2010 at 1:45 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:

> >>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:
>
>  Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
>
> Thanks, but I find this too hackish. M4 is not a package typically
> needed on really small systems, so just depending on WCHAR is cleaner
> imho.
>
> --
> Bye, Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100919/e7dcc064/attachment-0001.html>

[Buildroot] [PATCH 18/21] ntp: convert to autotargets and bump to 4.2.6p2

[Martin Banky]

Thomas,
     Thank you for the tips! As you can probably tell, I'm new to writing
makefiles, and have been using the other mk files in buildroot as examples.
Not always the best way to pick up the proper format for the buildroot
makefiles. Feel free to point out other issues with my mk files in the
future. You won't hurt my feelings, and I always appreciate being shown how
to do it properly.

Martin

On Sat, Sep 18, 2010 at 10:19 AM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> Hello !
>
> On Mon, 13 Sep 2010 20:40:45 -0700
> Martin Banky <martin.banky@gmail.com> wrote:
>
> > +config BR2_PACKAGE_NTP_NTP-KEYGEN
>
> Please don't use the dash character in configuration options. This
> should be BR2_PACKAGE_NTP_KEYGEN or BR2_PACKAGE_NTP_NTP_KEYGEN.
>
> > +NTP_DIR = $(BUILD_DIR)/ntp-$(NTP_VERSION)
>
> Not needed.
>
> > +NTP_CAT = $(ZCAT)
>
> Not needed.
>
> >  ifeq ($(BR2_PACKAGE_NTP_SNTP),y)
> > +define NTP_INSTALL_SNTP
> >       install -m 755 $(NTP_DIR)/sntp/sntp $(TARGET_DIR)/usr/bin/sntp
> > +endef
> > +endif
>
> Instead of $(NTP_DIR), use $(@D).
>
> > +
> > +ifeq ($(BR2_PACKAGE_NTP_NTP-KEYGEN),y)
> > +define NTP_INSTALL_NTP-KEYGEN
> > +     install -m 755 $(NTP_DIR)/util/ntp-keygen
> $(TARGET_DIR)/usr/bin/ntp-keygen
> > +endef
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_NTP_NTP-WAIT),y)
> > +define NTP_INSTALL_NTP-WAIT
> > +     install -m 755 $(NTP_DIR)/scripts/ntp-wait
> $(TARGET_DIR)/usr/bin/ntp-wait
> > +endef
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_NTP_NTPDC),y)
> > +define NTP_INSTALL_NTPDC
> > +     install -m 755 $(NTP_DIR)/ntpdc/ntpdc $(TARGET_DIR)/usr/bin/ntpdc
> > +endef
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_NTP_NTPQ),y)
> > +define NTP_INSTALL_NTPQ
> > +     install -m 755 $(NTP_DIR)/ntpq/ntpq $(TARGET_DIR)/usr/bin/ntpq
> > +endef
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_NTP_NTPTRACE),y)
> > +define NTP_INSTALL_NTPTRACE
> > +     install -m 755 $(NTP_DIR)/scripts/ntptrace
> $(TARGET_DIR)/usr/bin/ntptrace
> > +endef
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_NTP_TICKADJ),y)
> > +define NTP_INSTALL_TICKADJ
> > +     install -m 755 $(NTP_DIR)/util/tickadj
> $(TARGET_DIR)/usr/bin/tickadj
> > +endef
> >  endif
> > +
> > +define NTP_INSTALL_TARGET_CMDS
> > +     install -m 755 $(NTP_DIR)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
> > +     $(NTP_INSTALL_SNTP)
> > +     $(NTP_INSTALL_NTP-KEYGEN)
> > +     $(NTP_INSTALL_NTP-WAIT)
> > +     $(NTP_INSTALL_NTPDC)
> > +     $(NTP_INSTALL_NTPQ)
> > +     $(NTP_INSTALL_NTPTRACE)
> > +     $(NTP_INSTALL_TICKADJ)
>
> Humm, you could rewrite this this way:
>
> NTP_INSTALL_BIN_FILES =
> ifeq ($(BR2_PACKAGE_NTP_NTP_KEYGEN),y)
> NTP_INSTALL_BIN_FILES += util/ntp-keygen
> endif
> ifeq ($(BR2_PACKAGE_NTP_NTP-WAIT),y)
> NTP_INSTALL_BIN_FILES += scripts/ntp-wait
> endif
> ...
>
> and then :
>
> define NTP_INSTALL_TARGET_CMDS
>        install -m 755 $(NTP_DIR)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd
>        test -z "$(NTP_INSTALL_BIN_FILES)" || install -m 755 $(addprefix
> $(@D),$(NTP_INSTALL_BIN_FILES)) $(TARGET_DIR)/usr/bin/
> endif
>
> and finally :
>
> define NTP_UNINSTALL_TARGET_CMDS
>        rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(NTP_INSTALL_BIN_FILES))
> endif
>
> Regards,
>
> Thomas
> --
> Thomas Petazzoni, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100921/89ca7665/attachment-0001.html>

[Buildroot] [PATCH 08/21] genext2fs: bump to 1.4.1

[Peter Korsgaard]

>>>>> "Martin" == Martin Banky <martin.banky@gmail.com> writes:

 Martin> Signed-off-by: Martin Banky <Martin.Banky@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 08/21] genext2fs: bump to 1.4.1

[Martin Banky]

Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
 package/genext2fs/genext2fs-1.4-nosquash.patch     |   14 -------------
 .../genext2fs-1.4-remove_ugly_warnings.patch       |   21 --------------------
 package/genext2fs/genext2fs-1.4.1-nosquash.patch   |   14 +++++++++++++
 .../genext2fs-1.4.1-remove_ugly_warnings.patch     |   21 ++++++++++++++++++++
 package/genext2fs/genext2fs.mk                     |    2 +-
 5 files changed, 36 insertions(+), 36 deletions(-)
 delete mode 100644 package/genext2fs/genext2fs-1.4-nosquash.patch
 delete mode 100644 package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
 create mode 100644 package/genext2fs/genext2fs-1.4.1-nosquash.patch
 create mode 100644 package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch

diff --git a/package/genext2fs/genext2fs-1.4-nosquash.patch b/package/genext2fs/genext2fs-1.4-nosquash.patch
deleted file mode 100644
index 236dfcc..0000000
--- a/package/genext2fs/genext2fs-1.4-nosquash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c
---- genext2fs-1.4/genext2fs.c	2006-12-19 17:45:31.000000000 +0100
-+++ genext2fs-1.4-nosquash/genext2fs.c	2007-02-09 10:47:05.000000000 +0100
-@@ -1629,10 +1629,6 @@
- 		mtime = st.st_mtime;
- 		name = dent->d_name;
- 		mode = get_mode(&st);
--		if(squash_uids)
--			uid = gid = 0;
--		if(squash_perms)
--			mode &= ~(FM_IRWXG | FM_IRWXO);
- 		if(stats)
- 			switch(st.st_mode & S_IFMT)
- 			{
diff --git a/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
deleted file mode 100644
index ef23dfb..0000000
--- a/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c
---- genext2fs-1.4/genext2fs.c	2007-02-09 10:54:56.000000000 +0100
-+++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c	2007-02-09 10:54:30.000000000 +0100
-@@ -1606,7 +1606,7 @@
- static void
- add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats)
- {
--	uint32 nod;
-+	uint32 nod = 0;
- 	uint32 uid, gid, mode, ctime, mtime;
- 	const char *name;
- 	FILE *fh;
-@@ -2056,7 +2056,7 @@
- static filesystem *
- load_fs(FILE * fh, int swapit)
- {
--	size_t fssize;
-+	size_t fssize = 0;
- 	filesystem *fs;
- 	if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1))
- 		perror_msg_and_die("input filesystem image");
diff --git a/package/genext2fs/genext2fs-1.4.1-nosquash.patch b/package/genext2fs/genext2fs-1.4.1-nosquash.patch
new file mode 100644
index 0000000..236dfcc
--- /dev/null
+++ b/package/genext2fs/genext2fs-1.4.1-nosquash.patch
@@ -0,0 +1,14 @@
+diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c
+--- genext2fs-1.4/genext2fs.c	2006-12-19 17:45:31.000000000 +0100
++++ genext2fs-1.4-nosquash/genext2fs.c	2007-02-09 10:47:05.000000000 +0100
+@@ -1629,10 +1629,6 @@
+ 		mtime = st.st_mtime;
+ 		name = dent->d_name;
+ 		mode = get_mode(&st);
+-		if(squash_uids)
+-			uid = gid = 0;
+-		if(squash_perms)
+-			mode &= ~(FM_IRWXG | FM_IRWXO);
+ 		if(stats)
+ 			switch(st.st_mode & S_IFMT)
+ 			{
diff --git a/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch
new file mode 100644
index 0000000..ef23dfb
--- /dev/null
+++ b/package/genext2fs/genext2fs-1.4.1-remove_ugly_warnings.patch
@@ -0,0 +1,21 @@
+diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c
+--- genext2fs-1.4/genext2fs.c	2007-02-09 10:54:56.000000000 +0100
++++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c	2007-02-09 10:54:30.000000000 +0100
+@@ -1606,7 +1606,7 @@
+ static void
+ add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats)
+ {
+-	uint32 nod;
++	uint32 nod = 0;
+ 	uint32 uid, gid, mode, ctime, mtime;
+ 	const char *name;
+ 	FILE *fh;
+@@ -2056,7 +2056,7 @@
+ static filesystem *
+ load_fs(FILE * fh, int swapit)
+ {
+-	size_t fssize;
++	size_t fssize = 0;
+ 	filesystem *fs;
+ 	if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1))
+ 		perror_msg_and_die("input filesystem image");
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 8c4981e..b4a8e70 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-GENEXT2FS_VERSION=1.4
+GENEXT2FS_VERSION=1.4.1
 GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
 GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
 
-- 
1.7.2.3