[ptxdist] [PATCH v2 2/3] file: bump version to 5.24

[Clemens Gruber <clemens.gruber@pqgruber.com>]

Bump version of the file tool to 5.24 (many security vulnerabilities
fixed since 5.19) and specify the used license.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...p-around-Remi-Collet-at-redhat-cherry-pic.patch | 26 ----------------------
 patches/file-5.19/series                           |  5 -----
 rules/file.make                                    |  6 ++---
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
 delete mode 100644 patches/file-5.19/series

diff --git a/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch b/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
deleted file mode 100644
index bcb141f..0000000
--- a/patches/file-5.19/0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Christos Zoulas <christos@zoulas.com>
-Date: Thu, 7 Aug 2014 09:38:35 +0000
-Subject: [PATCH] Prevent wrap around (Remi Collet at redhat) (cherry picked
- from commit 0641e56be1af003aa02c7c6b0184466540637233)
-
-Conflicts:
-	src/cdf.c
----
- src/cdf.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cdf.c b/src/cdf.c
-index 106fc7a..bc94cb9 100644
---- a/src/cdf.c
-+++ b/src/cdf.c
-@@ -824,6 +824,10 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
- 		q = (const uint8_t *)(const void *)
- 		    ((const char *)(const void *)p + ofs
- 		    - 2 * sizeof(uint32_t));
-+		if (q < p) {
-+			DPRINTF(("Wrapped around %p < %p\n", q, p));
-+			goto out;
-+		}
- 		if (q > e) {
- 			DPRINTF(("Ran of the end %p > %p\n", q, e));
- 			goto out;
diff --git a/patches/file-5.19/series b/patches/file-5.19/series
deleted file mode 100644
index eacd4da..0000000
--- a/patches/file-5.19/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-#tag:upstream --start-number 1
-0001-Prevent-wrap-around-Remi-Collet-at-redhat-cherry-pic.patch
-# 5d28e91bad86a7562482bbcb752de1f1  - git-ptx-patches magic
diff --git a/rules/file.make b/rules/file.make
index 5435a8f..257e1bb 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -16,14 +16,14 @@ PACKAGES-$(PTXCONF_FILE) += file
 #
 # Paths and names
 #
-FILE_VERSION	:= 5.19
-FILE_MD5	:= e3526f59023f3f7d1ffa4d541335edab
+FILE_VERSION	:= 5.24
+FILE_MD5	:= ec161b5a0d2aef147fb046e5630b1408
 FILE		:= file-$(FILE_VERSION)
 FILE_SUFFIX	:= tar.gz
 FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
 FILE_SOURCE	:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
 FILE_DIR	:= $(BUILDDIR)/$(FILE)
-FILE_LICENSE	:= unknown
+FILE_LICENSE	:= BSD, 2-term BSD
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.5.0


-- 
ptxdist mailing list
ptxdist@pengutronix.de