From 5da51e1d4f49c947aeb69c84e6d5492c714117c5 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Mon, 11 Mar 2024 15:35:36 +0900 Subject: Fix ZLIB_VERSION version info configure check error log. ===================================================================== [ 218s] configure: error: *** zlib too old - check config.log *** [ 218s] Your reported zlib version has known security problems. It's possible your [ 218s] vendor has fixed these problems without changing the version number. If you [ 218s] are sure this is the case, you can disable the check by running [ 218s] "./configure --without-zlib-version-check". [ 218s] If you are in doubt, upgrade zlib to version 1.2.3 or greater. [ 218s] See http://www.gzip.org/zlib/ for details. ===================================================================== configure file check 3 digits for zlib version. so change zlib version "1.3" to "1.3.0" Change-Id: I960f66b7126bd692d3eeea85930c24e75e6b0657 --- zlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zlib.h b/zlib.h index 6b7244f..806f3fa 100644 --- a/zlib.h +++ b/zlib.h @@ -37,7 +37,7 @@ extern "C" { #endif -#define ZLIB_VERSION "1.3" +#define ZLIB_VERSION "1.3.0" #define ZLIB_VERNUM 0x1300 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 3 -- cgit v1.2.3 From c5d9be463d3154b1992351b3203374ca5e6fcea9 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 14 May 2024 12:14:01 +0900 Subject: Add Remove-the-definition-of-NOUNCRYPT patch Change-Id: I7a3971213f4ef8179f83e62819ee790891b7bb2e --- .../0001-Remove-the-definition-of-NOUNCRYPT.patch | 46 ++++++++++++++++++++++ packaging/zlib.spec | 2 + 2 files changed, 48 insertions(+) create mode 100644 packaging/0001-Remove-the-definition-of-NOUNCRYPT.patch diff --git a/packaging/0001-Remove-the-definition-of-NOUNCRYPT.patch b/packaging/0001-Remove-the-definition-of-NOUNCRYPT.patch new file mode 100644 index 0000000..834c16e --- /dev/null +++ b/packaging/0001-Remove-the-definition-of-NOUNCRYPT.patch @@ -0,0 +1,46 @@ +From c3bd529aa71a18cceccb144ffd59c0a7956f1970 Mon Sep 17 00:00:00 2001 +From: DongHun Kwak +Date: Tue, 3 Jul 2018 14:04:28 +0900 +Subject: [PATCH] Remove the definition of NOUNCRYPT + +https://stackoverflow.com/questions/6711173/how-to-use-unzopencurrentfilepassword + +[Model] All +[BinType] AP +[Customer] OPEN + +[Issue#] N/A +[Request] N/A +[Occurrence Version] N/A + +[Problem] password not supported at zlib +[Cause & Measure] Remove definition NOUNCRYPT +[Checking Method] + +[Team] Open Source Management and Setting Part +[Developer] dh0128.kwak +[Solution company] Samsung +[Change Type] N/A + +Change-Id: I9c00895558e94306e847c841c9f7291b68ffadf5 +Signed-off-by: DongHun Kwak +--- + contrib/minizip/unzip.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c +index bcfb941..b1cae82 100644 +--- a/contrib/minizip/unzip.c ++++ b/contrib/minizip/unzip.c +@@ -69,7 +69,7 @@ + #include + + #ifndef NOUNCRYPT +- #define NOUNCRYPT ++//#define NOUNCRYPT + #endif + + #include "zlib.h" +-- +2.25.1 + diff --git a/packaging/zlib.spec b/packaging/zlib.spec index 2a40dd2..280817f 100644 --- a/packaging/zlib.spec +++ b/packaging/zlib.spec @@ -13,6 +13,7 @@ Source: http://zlib.net/zlib-%{version}.tar.bz2 Source1: LICENSE Source2: baselibs.conf Source1001: zlib.manifest +Source1002: 0001-Remove-the-definition-of-NOUNCRYPT.patch BuildRequires: pkgconfig %description @@ -65,6 +66,7 @@ developing applications which use minizip. %setup -q cp %{SOURCE1} . cp %{SOURCE1001} . +%{__patch} -p1 < %{SOURCE1002} %build export LDFLAGS="-Wl,-z,relro,-z,now" -- cgit v1.2.3