busybox-1.18.1: add latest fix
PATCH 1/3 busybox-1.18.1: add latest fix
* patch comes from :
http://busybox.net/downloads/fixes-1.18.1/
* original commit in bb's git :
bzip2: plug memory leak on every processed file
--- .../busybox-1.18.1/busybox-1.18.1-bzip2.patch | 40 ++++++++++++++++++++ recipes/busybox/busybox_1.18.1.bb | 3 +- 2 files changed, 42 insertions(+), 1 deletions(-) create mode 100644 recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch
recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch new file +40 -0
@@ -0,0 +1,40 @@ +diff -urpN busybox-1.18.1/archival/bzip2.c busybox-1.18.1-bzip2/archival/bzip2.c +--- busybox-1.18.1/archival/bzip2.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1-bzip2/archival/bzip2.c 2010-12-30 04:43:11.000000000 +0100 +@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC comp + break; + } + +-#if ENABLE_FEATURE_CLEAN_UP ++ /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP - ++ * we are called repeatedly ++ */ + BZ2_bzCompressEnd(strm); + free(iobuf); +-#endif ++ + return total; + } + +diff -urpN busybox-1.18.1/archival/libarchive/bz/bzlib.c busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c +--- busybox-1.18.1/archival/libarchive/bz/bzlib.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c 2010-12-30 04:43:11.000000000 +0100 +@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int + + + /*---------------------------------------------------*/ +-#if ENABLE_FEATURE_CLEAN_UP + static + void BZ2_bzCompressEnd(bz_stream *strm) + { +@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm) + free(s->arr2); + free(s->ftab); + free(s->crc32table); +- free(strm->state); ++ free(s); + } +-#endif + + + /*---------------------------------------------------*/
recipes/busybox/busybox_1.18.1.bb +2 -1
@@ -1,11 +1,12 @@ require busybox_1.1x.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" SRC_URI += " \ file://busybox-1.18.1-hush.patch \ file://busybox-1.18.1-cpio.patch \ + file://busybox-1.18.1-bzip2.patch \ " SRC_URI[md5sum] = "f15fe752d8b7012aa5e59f83b88ccb1c"
Signature · 1 line
1.6.3.3
PATCH 2/3 busybox-1.18.1 is stable so can be the default
so remove DP=-1
--- recipes/busybox/busybox_1.18.1.bb | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
recipes/busybox/busybox_1.18.1.bb +0 -2
@@ -1,8 +1,6 @@ require busybox_1.1x.inc PR = "${INC_PR}.1" -DEFAULT_PREFERENCE = "-1" - SRC_URI += " \ file://busybox-1.18.1-hush.patch \ file://busybox-1.18.1-cpio.patch \
Signature · 1 line
1.6.3.3
PATCH 3/3 busybox-static: add 1.18.1
--- recipes/busybox/busybox-static_1.18.1.bb | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) create mode 100644 recipes/busybox/busybox-static_1.18.1.bb
recipes/busybox/busybox-static_1.18.1.bb new file +10 -0
@@ -0,0 +1,10 @@ +require busybox_${PV}.bb + +FILESPATHPKG =. "busybox-${PV}:" +S = "${WORKDIR}/busybox-${PV}" + +do_configure_append() { + sed -i -e '/CONFIG_STATIC/d' .config + echo "CONFIG_STATIC=y" >>.config +} +
Signature · 1 line
1.6.3.3
Re: [PATCH 3/3] busybox-static: add 1.18.1
Quoted 1 line · Eric Bénard
Signed-off-by Eric Bénard <[email protected]>
Quoted 30 lines
---
recipes/busybox/busybox-static_1.18.1.bb | 10 ++++++++++1 files changed, 10 insertions(+), 0 deletions(-)create mode 100644 recipes/busybox/busybox-static_1.18.1.bb
recipes/busybox/busybox-static_1.18.1.bb new file +10
-1@@ -0,0 +1,10 @@ +require busybox_${PV}.bb + +FILESPATHPKG =. "busybox-${PV}:" +S = "${WORKDIR}/busybox-${PV}" + +do_configure_append() { + sed -i -e '/CONFIG_STATIC/d' .config + echo "CONFIG_STATIC=y" >>.config +} + --1.6.3.3
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 2/3] busybox-1.18.1 is stable so can be the default
In reply to Eric BénardQuoted 3 lines · Eric Bénard
so remove DP=-1
Signed-off-by Eric Bénard <[email protected]>
Quoted 26 lines
---
recipes/busybox/busybox_1.18.1.bb | 2 --1 files changed, 0 insertions(+), 2 deletions(-)recipes/busybox/busybox_1.18.1.bb +0
-0@@ -1,8 +1,6 @@require busybox_1.1x.inc
PR = "${INC_PR}.1"recipes/busybox/busybox_1.18.1.bb +0
-2-DEFAULT_PREFERENCE = "-1" -SRC_URI += " \
file://busybox-1.18.1-hush.patch \
file://busybox-1.18.1-cpio.patch \
--
1.6.3.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 6 lines · Eric Bénard
* patch comes from :
http://busybox.net/downloads/fixes-1.18.1/
* original commit in bb's git :
bzip2: plug memory leak on every processed fileSigned-off-by Eric Bénard <[email protected]>
Quoted 79 lines
---
.../busybox-1.18.1/busybox-1.18.1-bzip2.patch | 40 ++++++++++++++++++++ recipes/busybox/busybox_1.18.1.bb | 3 +-2 files changed, 42 insertions(+), 1 deletions(-)create mode 100644
recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patchrecipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch new file +40
-0@@ -0,0 +1,40 @@ +diff -urpN busybox-1.18.1/archival/bzip2.c busybox-1.18.1-bzip2/archival/bzip2.c +--- busybox-1.18.1/archival/bzip2.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1-bzip2/archival/bzip2.c 2010-12-30 04:43:11.000000000 +0100 +@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC comp + break; + } + +-#if ENABLE_FEATURE_CLEAN_UP ++ /* Can't be conditional on ENABLE_FEATURE_CLEAN_UP - ++ * we are called repeatedly ++ */ + BZ2_bzCompressEnd(strm); + free(iobuf); +-#endif ++ + return total; + } + +diff -urpN busybox-1.18.1/archival/libarchive/bz/bzlib.c busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c +--- busybox-1.18.1/archival/libarchive/bz/bzlib.c 2010-12-20 01:41:26.000000000 +0100 ++++ busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c 2010-12-30 04:43:11.000000000 +0100 +@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int + + + /*---------------------------------------------------*/ +-#if ENABLE_FEATURE_CLEAN_UP + static + void BZ2_bzCompressEnd(bz_stream *strm) + { +@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm) + free(s->arr2); + free(s->ftab); + free(s->crc32table); +- free(strm->state); ++ free(s); + } +-#endif + + + /*---------------------------------------------------*/recipes/busybox/busybox_1.18.1.bb +0
-0@@ -1,11 +1,12 @@require busybox_1.1x.inc
recipes/busybox/busybox_1.18.1.bb +1
-1-PR = "${INC_PR}.0" +PR = "${INC_PR}.1"DEFAULT_PREFERENCE = "-1"
SRC_URI += " \
file://busybox-1.18.1-hush.patch \
file://busybox-1.18.1-cpio.patch \
+ file://busybox-1.18.1-bzip2.patch \
"SRC_URI[md5sum] = "
f15fe752d8b7012aa5e59f83b88ccb1c" --
1.6.3.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel