Skip to contentSkip to conversation

busybox: add 1.18.0, remove 1.13.x and 1.14.x, mark 1.15.x as deprecated

PATCH New Gustavo Zacarias 2 participants 4 messages Dec 3, 2010 – Dec 11, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 busybox: add 1.18.0, remove 1.13.x and 1.14.x, mark 1.15.x as deprecated

---
 package/busybox/Config.in                          |   20 +-
 .../busybox-1.18.0/busybox-1.18.0-buildsys.patch   |   21 +
 .../busybox-1.18.0/busybox-1.18.0-sha.patch        |  118 +++
 package/busybox/busybox-1.18.x.config              |  986 ++++++++++++++++++++
 4 files changed, 1132 insertions(+), 13 deletions(-)
 create mode 100644 package/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch
 create mode 100644 package/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch
 create mode 100644 package/busybox/busybox-1.18.x.config
package/busybox/Config.in +7 -13
index e53046e..48ba1c8 100644
@@ -17,16 +17,9 @@ choice
 	help
 	  Select the version of BusyBox you wish to use.
 
-	config BR2_BUSYBOX_VERSION_1_13_X
-		bool "BusyBox 1.13.x"
-		depends on BR2_DEPRECATED
-
-	config BR2_BUSYBOX_VERSION_1_14_X
-		bool "BusyBox 1.14.x"
-		depends on BR2_DEPRECATED
-
 	config BR2_BUSYBOX_VERSION_1_15_X
 		bool "BusyBox 1.15.x"
+		depends on BR2_DEPRECATED
 
 	config BR2_BUSYBOX_VERSION_1_16_X
 		bool "BusyBox 1.16.x"
@@ -34,6 +27,9 @@ choice
 	config BR2_BUSYBOX_VERSION_1_17_X
 		bool "BusyBox 1.17.x"
 
+	config BR2_BUSYBOX_VERSION_1_18_X
+		bool "BusyBox 1.18.x"
+
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
 
@@ -41,11 +37,10 @@ endchoice
 
 config BR2_BUSYBOX_VERSION
 	string
-	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X
-	default "1.14.4"	if BR2_BUSYBOX_VERSION_1_14_X
 	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
+	default "1.18.0"	if BR2_BUSYBOX_VERSION_1_18_X
 
 config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 	bool "Run BusyBox's own full installation"
@@ -61,12 +56,11 @@ config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
-	default "package/busybox/busybox-1.17.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
-	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X
-	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_14_X
+	default "package/busybox/busybox-1.18.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_15_X
 	default "package/busybox/busybox-1.16.x.config" if BR2_BUSYBOX_VERSION_1_16_X
 	default "package/busybox/busybox-1.17.x.config" if BR2_BUSYBOX_VERSION_1_17_X
+	default "package/busybox/busybox-1.18.x.config" if BR2_BUSYBOX_VERSION_1_18_X
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.
package/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch new file +21 -0
new file mode 100644
index 0000000..c72e4d3
@@ -0,0 +1,21 @@
+diff -urpN busybox-1.18.0/scripts/gen_build_files.sh busybox-1.18.0-buildsys/scripts/gen_build_files.sh
+--- busybox-1.18.0/scripts/gen_build_files.sh	2010-11-22 21:43:22.000000000 +0100
++++ busybox-1.18.0-buildsys/scripts/gen_build_files.sh	2010-11-24 14:59:47.732712663 +0100
+@@ -18,14 +18,14 @@ generate()
+ 	local src="$1" dst="$2" header="$3" insert="$4"
+ 	#chk "${dst}"
+ 	(
+-		echo "${header}"
++		printf "%s\n" "${header}"
+ 		if grep -qs '^INSERT$' "${src}"; then
+ 			sed -n '1,/^INSERT$/p' "${src}"
+-			echo "${insert}"
++			printf "%s\n" "${insert}"
+ 			sed -n '/^INSERT$/,$p' "${src}"
+ 		else
+ 			if [ -n "${insert}" ]; then
+-				echo "ERROR: INSERT line missing in: ${src}" 1>&2
++				printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
+ 			fi
+ 			cat "${src}"
+ 		fi
package/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch new file +118 -0

118 lines not on this page · raw message

package/busybox/busybox-1.18.x.config new file +986 -0

986 lines not on this page · raw message

Signature · 1 line
1.7.2.2
#1 lore raw

PATCH 1/1 openssl: security bump to version 1.0.0c

---
 package/openssl/openssl-r19998.patch |   16 ----------------
 package/openssl/openssl.mk           |    2 +-
 2 files changed, 1 insertions(+), 17 deletions(-)
 delete mode 100644 package/openssl/openssl-r19998.patch
package/openssl/openssl-r19998.patch deleted +0 -16
deleted file mode 100644
index d986ae5..0000000
@@ -1,16 +0,0 @@
-Index: openssl/ssl/t1_lib.c
-RCS File: /v/openssl/cvs/openssl/ssl/t1_lib.c,v
-rcsdiff -q -kk '-r1.64.2.15' '-r1.64.2.16' -u '/v/openssl/cvs/openssl/ssl/t1_lib.c,v' 2>/dev/null
---- t1_lib.c	2010/11/16 13:26:24	1.64.2.15
-+++ t1_lib.c	2010/11/16 22:41:07	1.64.2.16
-@@ -779,8 +779,8 @@
- 				{
- 				if(s->session->tlsext_ecpointformatlist)
- 					{
--					*al = TLS1_AD_DECODE_ERROR;
--					return 0;
-+					OPENSSL_free(s->session->tlsext_ecpointformatlist);
-+					s->session->tlsext_ecpointformatlist = NULL;
- 					}
- 				s->session->tlsext_ecpointformatlist_length = 0;
- 				if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
package/openssl/openssl.mk +1 -1
index 4d50146..ff807c9 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0b
+OPENSSL_VERSION = 1.0.0c
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib
Signature · 1 line
1.7.2.2
#2 lore raw

PATCH 1/1 openssl: security bump to version 1.0.0c

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard