* [PATCH 1/3] busybox-1.18.1: add latest fix
@ 2010-12-31 22:49 Eric Bénard
2010-12-31 22:49 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Eric Bénard
2011-01-01 7:29 ` [PATCH 1/3] busybox-1.18.1: add latest fix Khem Raj
0 siblings, 2 replies; 6+ messages in thread
From: Eric Bénard @ 2010-12-31 22:49 UTC (permalink / raw)
To: openembedded-devel
* 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
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../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
diff --git a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch
new file mode 100644
index 0000000..cffa194
--- /dev/null
+++ b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch
@@ -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
+
+
+ /*---------------------------------------------------*/
diff --git a/recipes/busybox/busybox_1.18.1.bb b/recipes/busybox/busybox_1.18.1.bb
index 8fe1210..e41f46d 100644
--- a/recipes/busybox/busybox_1.18.1.bb
+++ b/recipes/busybox/busybox_1.18.1.bb
@@ -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"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] busybox-1.18.1 is stable so can be the default
2010-12-31 22:49 [PATCH 1/3] busybox-1.18.1: add latest fix Eric Bénard
@ 2010-12-31 22:49 ` Eric Bénard
2010-12-31 22:49 ` [PATCH 3/3] busybox-static: add 1.18.1 Eric Bénard
2011-01-01 7:30 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Khem Raj
2011-01-01 7:29 ` [PATCH 1/3] busybox-1.18.1: add latest fix Khem Raj
1 sibling, 2 replies; 6+ messages in thread
From: Eric Bénard @ 2010-12-31 22:49 UTC (permalink / raw)
To: openembedded-devel
so remove DP=-1
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/busybox/busybox_1.18.1.bb | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/recipes/busybox/busybox_1.18.1.bb b/recipes/busybox/busybox_1.18.1.bb
index e41f46d..2f78be9 100644
--- a/recipes/busybox/busybox_1.18.1.bb
+++ b/recipes/busybox/busybox_1.18.1.bb
@@ -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 \
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] busybox-static: add 1.18.1
2010-12-31 22:49 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Eric Bénard
@ 2010-12-31 22:49 ` Eric Bénard
2011-01-01 7:30 ` Khem Raj
2011-01-01 7:30 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Khem Raj
1 sibling, 1 reply; 6+ messages in thread
From: Eric Bénard @ 2010-12-31 22:49 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
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
diff --git a/recipes/busybox/busybox-static_1.18.1.bb b/recipes/busybox/busybox-static_1.18.1.bb
new file mode 100644
index 0000000..58aca93
--- /dev/null
+++ b/recipes/busybox/busybox-static_1.18.1.bb
@@ -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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] busybox-1.18.1: add latest fix
2010-12-31 22:49 [PATCH 1/3] busybox-1.18.1: add latest fix Eric Bénard
2010-12-31 22:49 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Eric Bénard
@ 2011-01-01 7:29 ` Khem Raj
1 sibling, 0 replies; 6+ messages in thread
From: Khem Raj @ 2011-01-01 7:29 UTC (permalink / raw)
To: openembedded-devel
On Fri, Dec 31, 2010 at 2:49 PM, Eric Bénard <eric@eukrea.com> wrote:
> * 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
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../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
>
> diff --git a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch
> new file mode 100644
> index 0000000..cffa194
> --- /dev/null
> +++ b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-bzip2.patch
> @@ -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
> +
> +
> + /*---------------------------------------------------*/
> diff --git a/recipes/busybox/busybox_1.18.1.bb b/recipes/busybox/busybox_1.18.1.bb
> index 8fe1210..e41f46d 100644
> --- a/recipes/busybox/busybox_1.18.1.bb
> +++ b/recipes/busybox/busybox_1.18.1.bb
> @@ -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"
> --
> 1.6.3.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] busybox-1.18.1 is stable so can be the default
2010-12-31 22:49 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Eric Bénard
2010-12-31 22:49 ` [PATCH 3/3] busybox-static: add 1.18.1 Eric Bénard
@ 2011-01-01 7:30 ` Khem Raj
1 sibling, 0 replies; 6+ messages in thread
From: Khem Raj @ 2011-01-01 7:30 UTC (permalink / raw)
To: openembedded-devel
On Fri, Dec 31, 2010 at 2:49 PM, Eric Bénard <eric@eukrea.com> wrote:
> so remove DP=-1
>
> Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/busybox/busybox_1.18.1.bb | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/busybox/busybox_1.18.1.bb b/recipes/busybox/busybox_1.18.1.bb
> index e41f46d..2f78be9 100644
> --- a/recipes/busybox/busybox_1.18.1.bb
> +++ b/recipes/busybox/busybox_1.18.1.bb
> @@ -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 \
> --
> 1.6.3.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] busybox-static: add 1.18.1
2010-12-31 22:49 ` [PATCH 3/3] busybox-static: add 1.18.1 Eric Bénard
@ 2011-01-01 7:30 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2011-01-01 7:30 UTC (permalink / raw)
To: openembedded-devel
On Fri, Dec 31, 2010 at 2:49 PM, Eric Bénard <eric@eukrea.com> wrote:
> Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> 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
>
> diff --git a/recipes/busybox/busybox-static_1.18.1.bb b/recipes/busybox/busybox-static_1.18.1.bb
> new file mode 100644
> index 0000000..58aca93
> --- /dev/null
> +++ b/recipes/busybox/busybox-static_1.18.1.bb
> @@ -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
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-01 7:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-31 22:49 [PATCH 1/3] busybox-1.18.1: add latest fix Eric Bénard
2010-12-31 22:49 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Eric Bénard
2010-12-31 22:49 ` [PATCH 3/3] busybox-static: add 1.18.1 Eric Bénard
2011-01-01 7:30 ` Khem Raj
2011-01-01 7:30 ` [PATCH 2/3] busybox-1.18.1 is stable so can be the default Khem Raj
2011-01-01 7:29 ` [PATCH 1/3] busybox-1.18.1: add latest fix Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.