diff --git a/CVE-2019-1010305.patch b/CVE-2019-1010305.patch deleted file mode 100644 index 3f79f22fb7786d1b03a48aa135cbe50b5a4dbf3a..0000000000000000000000000000000000000000 --- a/CVE-2019-1010305.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2f084136cfe0d05e5bf5703f3e83c6d955234b4d Mon Sep 17 00:00:00 2001 -From: Stuart Caie -Date: Mon, 18 Feb 2019 13:04:58 +0000 -Subject: [PATCH] length checks when looking for control files - ---- - libmspack/mspack/chmd.c | 24 +++++++++++------------- - 1 files changed, 11 insertions(+), 13 deletions(-) - -diff --git a/mspack/chmd.c b/mspack/chmd.c -index 91d926e..4813ccc 100644 ---- a/mspack/chmd.c -+++ b/mspack/chmd.c -@@ -483,19 +483,17 @@ static int chmd_read_headers(struct mspack_system *sys, struct mspack_file *fh, - - if (name[0] == ':' && name[1] == ':') { - /* system file */ -- if (mspack_memcmp(&name[2], &content_name[2], 31L) == 0) { -- if (mspack_memcmp(&name[33], &content_name[33], 8L) == 0) { -- chm->sec1.content = fi; -- } -- else if (mspack_memcmp(&name[33], &control_name[33], 11L) == 0) { -- chm->sec1.control = fi; -- } -- else if (mspack_memcmp(&name[33], &spaninfo_name[33], 8L) == 0) { -- chm->sec1.spaninfo = fi; -- } -- else if (mspack_memcmp(&name[33], &rtable_name[33], 72L) == 0) { -- chm->sec1.rtable = fi; -- } -+ if (name_len == 40 && memcmp(name, content_name, 40) == 0) { -+ chm->sec1.content = fi; -+ } -+ else if (name_len == 44 && memcmp(name, control_name, 44) == 0) { -+ chm->sec1.control = fi; -+ } -+ else if (name_len == 41 && memcmp(name, spaninfo_name, 41) == 0) { -+ chm->sec1.spaninfo = fi; -+ } -+ else if (name_len == 105 && memcmp(name, rtable_name, 105) == 0) { -+ chm->sec1.rtable = fi; - } - fi->next = chm->sysfiles; - chm->sysfiles = fi; diff --git a/libmspack-0.10.1alpha.tar.gz b/libmspack-0.10.1alpha.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..25e19e6049096d215092f5a1539cfedc3585cc44 Binary files /dev/null and b/libmspack-0.10.1alpha.tar.gz differ diff --git a/libmspack-v0.8alpha.tar.gz b/libmspack-v0.8alpha.tar.gz deleted file mode 100644 index a8590bad032501fafb20aace6d2065d1eb841205..0000000000000000000000000000000000000000 Binary files a/libmspack-v0.8alpha.tar.gz and /dev/null differ diff --git a/libmspack.spec b/libmspack.spec index a8b53da98612adf0de7ef10fbfbdd8691a07e1cf..a295009694fc61a67c6dfad6d6eae137e6b64fe5 100644 --- a/libmspack.spec +++ b/libmspack.spec @@ -1,12 +1,10 @@ Name: libmspack -Version: 0.8 +Version: 0.10.1 Release: 0.1.1 Summary: Library for CAB and related files compression and decompression License: LGPLv2.1 URL: http://www.cabextract.org.uk/libmspack/ -Source0: https://github.com/kyz/libmspack/archive/v0.8alpha/%{name}-v0.8alpha.tar.gz - -Patch0: CVE-2019-1010305.patch +Source0: https://github.com/kyz/libmspack/archive/v%{version}alpha/%{name}-%{version}alpha.tar.gz BuildRequires: doxygen gcc autoconf automake libtool @@ -31,7 +29,7 @@ The %{name}-help package contains README, TODO, COPYING.LIB, ChangeLog, AUTHORS and documentation for %{name}. %prep -%autosetup -n %{name}-%{version}alpha/libmspack -p1 +%autosetup -n %{name}-%{version}alpha -p1 chmod a-x mspack/mspack.h autoreconf -i @@ -54,7 +52,6 @@ mv Changelog.utf8 ChangeLog %files %{_libdir}/%{name}.so.* -%{_bindir}/* %doc COPYING.LIB %exclude %{_libdir}/libmspack.la @@ -68,6 +65,9 @@ mv Changelog.utf8 ChangeLog %doc doc %changelog +* Fri Mar 4 2022 panxiaohe - 0.10.1-0.1.1 +- update version to 0.10.1 + * Thu Jan 21 2021 yangzhuangzhuang - 0.8-0.1.1 - Type:enhancement - ID:NA