Patchwork [1/3] busybox-1.18.1: add latest fix

login
register
mail settings
Submitter Eric BENARD
Date Dec. 31, 2010, 10:49 p.m.
Message ID <1293835744-10837-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/151/
State Accepted
Headers show

Comments

Eric BENARD - Dec. 31, 2010, 10:49 p.m.
* 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
Khem Raj - Jan. 1, 2011, 7:29 a.m.
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
>

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"