diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2024-05-14 12:19:18 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2024-05-14 12:19:18 +0900 |
| commit | 47c9ac8d90f10802125fb3ce7cbf50a7bcf46886 (patch) | |
| tree | 3d07ef5d48d132f08ef861ecd498e56b0c6c168f | |
| parent | 818a018d1642299e938f5182de9a9c07081f85e9 (diff) | |
| parent | c5d9be463d3154b1992351b3203374ca5e6fcea9 (diff) | |
| download | zlib-47c9ac8d90f10802125fb3ce7cbf50a7bcf46886.tar.gz zlib-47c9ac8d90f10802125fb3ce7cbf50a7bcf46886.tar.bz2 zlib-47c9ac8d90f10802125fb3ce7cbf50a7bcf46886.zip | |
Merge branch 'tizen_base' into tizen_7.0_baseaccepted/tizen/7.0/base/20240521.055619accepted/tizen/7.0/base/20240520.210839tizen_7.0_baseaccepted/tizen_7.0_base
Change-Id: I5deff0d016e5eefd63a2fa977a089302be8109a3
| -rw-r--r-- | packaging/0001-Remove-the-definition-of-NOUNCRYPT.patch | 46 | ||||
| -rw-r--r-- | packaging/zlib.spec | 2 |
2 files changed, 48 insertions, 0 deletions
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 <dh0128.kwak@samsung.com> +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 <dh0128.kwak@samsung.com> +--- + 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 <string.h> + + #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" |