Re: [ptxdist] [PATCH] file: upgrade to 5.18

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Wed, Apr 02, 2014 at 04:07:10PM +0200, Alexander Dahl wrote:
> Patch series dropped, because applied upstream meanwhile. This fixes
> security issues and regressions.
> 
> Signed-off-by: Alexander Dahl <post@lespocky.de>

Thanks, applied.

Michael

> ---
>  .../0001-Fix-memory-leak-Anatol-Belski.patch       |   34 --------------------
>  ...-in-out-of-bounds-calculations-Jan-Kaluza.patch |   23 -------------
>  patches/file-5.17/series                           |    5 ---
>  rules/file.make                                    |    4 +--
>  4 files changed, 2 insertions(+), 64 deletions(-)
>  delete mode 100644 patches/file-5.17/0001-Fix-memory-leak-Anatol-Belski.patch
>  delete mode 100644 patches/file-5.17/0002-off-by-one-in-out-of-bounds-calculations-Jan-Kaluza.patch
>  delete mode 100644 patches/file-5.17/series
> 
> diff --git a/patches/file-5.17/0001-Fix-memory-leak-Anatol-Belski.patch b/patches/file-5.17/0001-Fix-memory-leak-Anatol-Belski.patch
> deleted file mode 100644
> index 206e7eb..0000000
> --- a/patches/file-5.17/0001-Fix-memory-leak-Anatol-Belski.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From: Christos Zoulas <christos@zoulas.com>
> -Date: Fri, 21 Feb 2014 14:32:48 +0000
> -Subject: [PATCH] Fix memory leak (Anatol Belski)
> -
> -Conflicts:
> -	src/softmagic.c
> ----
> - src/softmagic.c |   10 +++++++---
> - 1 file changed, 7 insertions(+), 3 deletions(-)
> -
> -diff --git a/src/softmagic.c b/src/softmagic.c
> -index 5ed347e..7ee3f6f 100644
> ---- a/src/softmagic.c
> -+++ b/src/softmagic.c
> -@@ -1755,12 +1755,16 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
> - 		ms->offset = soffset;
> - 		if (rv == 1) {
> - 			if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
> --			    file_printf(ms, F(m->desc, "%u"), offset) == -1)
> -+			    file_printf(ms, F(m->desc, "%u"), offset) == -1) {
> -+				free(rbuf);
> - 				return -1;
> --			if (file_printf(ms, "%s", rbuf) == -1)
> -+			}
> -+			if (file_printf(ms, "%s", rbuf) == -1) {
> -+				free(rbuf);
> - 				return -1;
> --			free(rbuf);
> -+			}
> - 		}
> -+		free(rbuf);
> - 		return rv;
> - 
> - 	case FILE_USE:
> diff --git a/patches/file-5.17/0002-off-by-one-in-out-of-bounds-calculations-Jan-Kaluza.patch b/patches/file-5.17/0002-off-by-one-in-out-of-bounds-calculations-Jan-Kaluza.patch
> deleted file mode 100644
> index e4c61ca..0000000
> --- a/patches/file-5.17/0002-off-by-one-in-out-of-bounds-calculations-Jan-Kaluza.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: Christos Zoulas <christos@zoulas.com>
> -Date: Tue, 4 Mar 2014 17:42:19 +0000
> -Subject: [PATCH] off by one in out of bounds calculations (Jan Kaluza)
> -
> -Conflicts:
> -	src/softmagic.c
> ----
> - src/softmagic.c |    2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/src/softmagic.c b/src/softmagic.c
> -index 7ee3f6f..3919fa7 100644
> ---- a/src/softmagic.c
> -+++ b/src/softmagic.c
> -@@ -71,7 +71,7 @@ private void cvt_16(union VALUETYPE *, const struct magic *);
> - private void cvt_32(union VALUETYPE *, const struct magic *);
> - private void cvt_64(union VALUETYPE *, const struct magic *);
> - 
> --#define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >= ((n) - (o)))
> -+#define OFFSET_OOB(n, o, i)	((n) < (o) || (i) > ((n) - (o)))
> - /*
> -  * softmagic - lookup one file in parsed, in-memory copy of database
> -  * Passed the name and FILE * of one file to be typed.
> diff --git a/patches/file-5.17/series b/patches/file-5.17/series
> deleted file mode 100644
> index 6b27f34..0000000
> --- a/patches/file-5.17/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Fix-memory-leak-Anatol-Belski.patch
> -0002-off-by-one-in-out-of-bounds-calculations-Jan-Kaluza.patch
> -# 4440242115f6c92b22376f9aa65eca96  - git-ptx-patches magic
> diff --git a/rules/file.make b/rules/file.make
> index 000fd13..c5e9771 100644
> --- a/rules/file.make
> +++ b/rules/file.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FILE) += file
>  #
>  # Paths and names
>  #
> -FILE_VERSION	:= 5.17
> -FILE_MD5	:= e19c47e069ced7b01ccb4db402cc01d3
> +FILE_VERSION	:= 5.18
> +FILE_MD5	:= d420d8f2990cd344673acfbf8d76ff5a
>  FILE		:= file-$(FILE_VERSION)
>  FILE_SUFFIX	:= tar.gz
>  FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de