!4 update version to 0.10.1
From: @panxh_purple Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1
This commit is contained in:
commit
90fc0a3528
@ -1,44 +0,0 @@
|
|||||||
From 2f084136cfe0d05e5bf5703f3e83c6d955234b4d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stuart Caie <kyzer@cabextract.org.uk>
|
|
||||||
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;
|
|
||||||
BIN
libmspack-0.10.1alpha.tar.gz
Normal file
BIN
libmspack-0.10.1alpha.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,12 +1,10 @@
|
|||||||
Name: libmspack
|
Name: libmspack
|
||||||
Version: 0.8
|
Version: 0.10.1
|
||||||
Release: 0.1.1
|
Release: 0.1.1
|
||||||
Summary: Library for CAB and related files compression and decompression
|
Summary: Library for CAB and related files compression and decompression
|
||||||
License: LGPLv2.1
|
License: LGPLv2.1
|
||||||
URL: http://www.cabextract.org.uk/libmspack/
|
URL: http://www.cabextract.org.uk/libmspack/
|
||||||
Source0: https://github.com/kyz/libmspack/archive/v0.8alpha/%{name}-v0.8alpha.tar.gz
|
Source0: https://github.com/kyz/libmspack/archive/v%{version}alpha/%{name}-%{version}alpha.tar.gz
|
||||||
|
|
||||||
Patch0: CVE-2019-1010305.patch
|
|
||||||
|
|
||||||
BuildRequires: doxygen gcc autoconf automake libtool
|
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}.
|
and documentation for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version}alpha/libmspack -p1
|
%autosetup -n %{name}-%{version}alpha -p1
|
||||||
|
|
||||||
chmod a-x mspack/mspack.h
|
chmod a-x mspack/mspack.h
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
@ -54,7 +52,6 @@ mv Changelog.utf8 ChangeLog
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%{_libdir}/%{name}.so.*
|
%{_libdir}/%{name}.so.*
|
||||||
%{_bindir}/*
|
|
||||||
%doc COPYING.LIB
|
%doc COPYING.LIB
|
||||||
%exclude %{_libdir}/libmspack.la
|
%exclude %{_libdir}/libmspack.la
|
||||||
|
|
||||||
@ -68,6 +65,9 @@ mv Changelog.utf8 ChangeLog
|
|||||||
%doc doc
|
%doc doc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 4 2022 panxiaohe <panxh.life@foxmail.com> - 0.10.1-0.1.1
|
||||||
|
- update version to 0.10.1
|
||||||
|
|
||||||
* Thu Jan 21 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 0.8-0.1.1
|
* Thu Jan 21 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 0.8-0.1.1
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user