* [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15
@ 2011-11-10 11:25 Gustavo Zacarias
2011-11-10 11:25 ` [Buildroot] [PATCH 2/3] flex: bump to version 2.5.35-10 and cleanup style Gustavo Zacarias
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2011-11-10 11:25 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
...it-tools-3.15-add-manpages-config-option.patch} | 0
package/module-init-tools/module-init-tools.mk | 13 +++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
rename package/module-init-tools/{module-init-tools-3.11-add-manpages-config-option.patch => module-init-tools-3.15-add-manpages-config-option.patch} (100%)
diff --git a/package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch b/package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
similarity index 100%
rename from package/module-init-tools/module-init-tools-3.11-add-manpages-config-option.patch
rename to package/module-init-tools/module-init-tools-3.15-add-manpages-config-option.patch
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index d7e7c24..ad92a1a 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -3,19 +3,20 @@
# module-init-tools
#
#############################################################
-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_VERSION = 3.15
+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=''
MODULE_INIT_TOOLS_CONF_OPT = \
--disable-static-utils \
--disable-builddir \
--program-transform-name=''
-# module-init-tools-3.11-add-manpages-config-option.patch is modifying
+# module-init-tools-3.15-add-manpages-config-option.patch is modifying
# configure.ac and Makefile.am
-MODULE_INIT_TOOLS_AUTORECONF=YES
-HOST_MODULE_INIT_TOOLS_AUTORECONF=YES
+MODULE_INIT_TOOLS_AUTORECONF = YES
+HOST_MODULE_INIT_TOOLS_AUTORECONF = YES
HOST_MODULE_INIT_TOOLS_CONF_ENV = ac_cv_prog_DOCBOOKTOMAN=''
$(eval $(call AUTOTARGETS))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] flex: bump to version 2.5.35-10 and cleanup style
2011-11-10 11:25 [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15 Gustavo Zacarias
@ 2011-11-10 11:25 ` Gustavo Zacarias
2011-11-11 20:42 ` Peter Korsgaard
2011-11-10 11:25 ` [Buildroot] [PATCH 3/3] dropbear: bump to version 2011.54 Gustavo Zacarias
2011-11-11 20:41 ` [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15 Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2011-11-10 11:25 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
....33-prog-ar.patch => flex-2.5.35-prog-ar.patch} | 0
package/flex/flex.mk | 23 ++++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
rename package/flex/{flex-2.5.33-prog-ar.patch => flex-2.5.35-prog-ar.patch} (100%)
diff --git a/package/flex/flex-2.5.33-prog-ar.patch b/package/flex/flex-2.5.35-prog-ar.patch
similarity index 100%
rename from package/flex/flex-2.5.33-prog-ar.patch
rename to package/flex/flex-2.5.35-prog-ar.patch
diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 706b89d..df1b420 100644
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -3,24 +3,25 @@
# flex
#
#############################################################
-FLEX_VERSION:=2.5.35
-FLEX_PATCH_VERSION:=9.1
-FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
-FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
-FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
-FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)
-FLEX_INSTALL_STAGING=YES
+
+FLEX_VERSION = 2.5.35
+FLEX_PATCH_VERSION = 10
+FLEX_SOURCE = flex_$(FLEX_VERSION).orig.tar.gz
+FLEX_PATCH = flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
+FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
+FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
+FLEX_INSTALL_STAGING = YES
FLEX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_GETTEXT),gettext) \
$(if $(BR2_PACKAGE_LIBINTL),libintl)
# lex -> flex
define FLEX_INSTALL_LEX
-cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
+ cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
endef
define FLEX_UNINSTALL_LEX
--rm $(TARGET_DIR)/usr/bin/lex
+ -rm $(TARGET_DIR)/usr/bin/lex
endef
FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
@@ -29,11 +30,11 @@ FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX
# libfl installation
ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
define FLEX_INSTALL_LIBFL
-install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
+ install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
endef
define FLEX_UNINSTALL_LIBFL
--rm $(STAGING_DIR)/lib/libfl.a
+ -rm $(STAGING_DIR)/lib/libfl.a
endef
FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] dropbear: bump to version 2011.54
2011-11-10 11:25 [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15 Gustavo Zacarias
2011-11-10 11:25 ` [Buildroot] [PATCH 2/3] flex: bump to version 2.5.35-10 and cleanup style Gustavo Zacarias
@ 2011-11-10 11:25 ` Gustavo Zacarias
2011-11-11 20:42 ` Peter Korsgaard
2011-11-11 20:41 ` [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15 Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2011-11-10 11:25 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
.../dropbear-0.53.1-static_build_fix.patch | 26 --------------------
package/dropbear/dropbear-2011.54-no-ipv6.patch | 18 +++++++++++++
package/dropbear/dropbear.mk | 3 +-
3 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 package/dropbear/dropbear-0.53.1-static_build_fix.patch
create mode 100644 package/dropbear/dropbear-2011.54-no-ipv6.patch
diff --git a/package/dropbear/dropbear-0.53.1-static_build_fix.patch b/package/dropbear/dropbear-0.53.1-static_build_fix.patch
deleted file mode 100644
index 0e0a91a..0000000
--- a/package/dropbear/dropbear-0.53.1-static_build_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-dropbear: fix static build
-
-the -lcrypt is missing during the link
-
-svr-authpasswd.o: In function `svr_auth_password':
-svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
-collect2: ld returned 1 exit status
-
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -77,7 +77,7 @@ STRIP=@STRIP@
- INSTALL=@INSTALL@
- CPPFLAGS=@CPPFLAGS@
- CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
--LIBS+=@LIBS@
-+LIBS+=@CRYPTLIB@ @LIBS@
- LDFLAGS=@LDFLAGS@
-
- EXEEXT=@EXEEXT@
diff --git a/package/dropbear/dropbear-2011.54-no-ipv6.patch b/package/dropbear/dropbear-2011.54-no-ipv6.patch
new file mode 100644
index 0000000..4ee9aaa
--- /dev/null
+++ b/package/dropbear/dropbear-2011.54-no-ipv6.patch
@@ -0,0 +1,18 @@
+Check for IPV6_TCLASS instead of IPPROTO_IPV6 since
+it's present on non-IPv6 enabled toolchains too.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+
+diff -Nura dropbear-2011.54.orig/dbutil.c dropbear-2011.54/dbutil.c
+--- dropbear-2011.54.orig/dbutil.c 2011-11-08 09:48:15.000000000 -0300
++++ dropbear-2011.54/dbutil.c 2011-11-09 12:14:59.430074138 -0300
+@@ -164,7 +164,7 @@
+ /* set the TOS bit for either ipv4 or ipv6 */
+ #ifdef IPTOS_LOWDELAY
+ val = IPTOS_LOWDELAY;
+-#ifdef IPPROTO_IPV6
++#ifdef IPV6_TCLASS
+ setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val));
+ #endif
+ setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index bced0ef..5fa50ba 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,8 +4,7 @@
#
#############################################################
-DROPBEAR_VERSION = 0.53.1
-DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
+DROPBEAR_VERSION = 2011.54
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15
2011-11-10 11:25 [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15 Gustavo Zacarias
2011-11-10 11:25 ` [Buildroot] [PATCH 2/3] flex: bump to version 2.5.35-10 and cleanup style Gustavo Zacarias
2011-11-10 11:25 ` [Buildroot] [PATCH 3/3] dropbear: bump to version 2011.54 Gustavo Zacarias
@ 2011-11-11 20:41 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2011-11-11 20:41 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] flex: bump to version 2.5.35-10 and cleanup style
2011-11-10 11:25 ` [Buildroot] [PATCH 2/3] flex: bump to version 2.5.35-10 and cleanup style Gustavo Zacarias
@ 2011-11-11 20:42 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2011-11-11 20:42 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] dropbear: bump to version 2011.54
2011-11-10 11:25 ` [Buildroot] [PATCH 3/3] dropbear: bump to version 2011.54 Gustavo Zacarias
@ 2011-11-11 20:42 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2011-11-11 20:42 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed to next, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-11-11 20:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-10 11:25 [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15 Gustavo Zacarias
2011-11-10 11:25 ` [Buildroot] [PATCH 2/3] flex: bump to version 2.5.35-10 and cleanup style Gustavo Zacarias
2011-11-11 20:42 ` Peter Korsgaard
2011-11-10 11:25 ` [Buildroot] [PATCH 3/3] dropbear: bump to version 2011.54 Gustavo Zacarias
2011-11-11 20:42 ` Peter Korsgaard
2011-11-11 20:41 ` [Buildroot] [PATCH 1/3] module-init-tools: bump to version 3.15 Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox