From f4b4f1644d2d62d2577e364cc60f599232da7141 Mon Sep 17 00:00:00 2001 From: Robin Dubey Date: Tue, 2 Dec 2025 14:45:46 +0530 Subject: [PATCH 1/5] Applying patch for zlib-1.3.1 Signed-off-by: Robin Dubey --- icc/zlib.mk | 16 +++++++--------- openssl_source/000_zutil.patch | 15 +++++++++++++++ openssl_source/zlib/1.3.1/000_zutil.patch | 15 +++++++++++++++ 3 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 openssl_source/000_zutil.patch create mode 100644 openssl_source/zlib/1.3.1/000_zutil.patch diff --git a/icc/zlib.mk b/icc/zlib.mk index b71a238..97388b4 100644 --- a/icc/zlib.mk +++ b/icc/zlib.mk @@ -18,7 +18,7 @@ ZLIB_TAR = $(ICC_ROOT)/openssl_source/$(ZLIB_NAME).tar.gz # EX_SUFFIX (=_ex) is defined to build from source already extracted from tar file and # checked into source control. This option is used by iSeries/OS400 for Clearcase builds. # removed zlib version from ZLIB_DIR so that the name does not keep changing so that MSVC projects are possible -ZLIB_DIR = $(ICC_ROOT)/zlib$(EX_SUFFIX) +ZLIB_DIR = $(ICC_ROOT)/openssl_source/zlib$(EX_SUFFIX) ZLIB_SRC = $(ZLIB_DIR)/adler32.c $(ZLIB_DIR)/compress.c $(ZLIB_DIR)/crc32.c \ $(ZLIB_DIR)/deflate.c $(ZLIB_DIR)/trees.c $(ZLIB_DIR)/zutil.c @@ -78,15 +78,13 @@ zutil$(OBJSUFX): $(ZLIB_DIR)/zutil.c $(ZLIB_DIR)/zlib.h create_zlib: $(ZLIB_TAR) if [ -e $(ZLIB_DIR) ] ; then rm -r $(ZLIB_DIR) ; fi [ -n "$(EX_SUFFIX)" ] || \ - ( cd .. ; \ - rm -rf x; mkdir x; cd x; \ - tar xzf $(ZLIB_TAR) ; \ - sleep 1 ; \ - mv $(ZLIB_NAME) $(ZLIB_DIR) ; \ - cd ..; \ + ( cd $(ICC_ROOT) ; \ + tar xzf openssl_source/$(ZLIB_NAME).tar.gz ; \ + mkdir -p openssl_source/zlib/$(ZLIB_VER) ; \ + cp openssl_source/*.patch openssl_source/zlib/$(ZLIB_VER)/ 2>/dev/null || true ; \ ) [ -n "$(EX_SUFFIX)" ] || \ - ( cd $(ZLIB_DIR); \ - sh ../openssl_source/tools/patchem2 "../openssl_source/zlib/$(ZLIB_VER)" ;\ + ( cd $(ICC_ROOT)/$(ZLIB_NAME) ; \ + sh $(ICC_ROOT)/openssl_source/tools/patchem2 "$(ICC_ROOT)/openssl_source/zlib/$(ZLIB_VER)" ; \ ) diff --git a/openssl_source/000_zutil.patch b/openssl_source/000_zutil.patch new file mode 100644 index 0000000..5557f99 --- /dev/null +++ b/openssl_source/000_zutil.patch @@ -0,0 +1,15 @@ +diff -urN zlib-1.3.1.orig/zutil.h zlib-1.3.1/zutil.h +--- zlib-1.3.1.orig/zutil.h 2024-01-22 09:39:42.000000000 +1000 ++++ zlib-1.3.1/zutil.h 2024-01-22 12:51:00.908632154 +1000 +@@ -42,6 +42,11 @@ typedef unsigned short ush; + typedef ush FAR ushf; + typedef unsigned long ulg; + ++/* 32 bit HP/UX compiler we use won't handle the large constants below */ ++#if defined(__hpux) && !defined(__LP64__) ++# define Z_U8 0xffffffffffffffff ++#endif ++ + #if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC) + # include + # if (ULONG_MAX == 0xffffffffffffffff) diff --git a/openssl_source/zlib/1.3.1/000_zutil.patch b/openssl_source/zlib/1.3.1/000_zutil.patch new file mode 100644 index 0000000..5557f99 --- /dev/null +++ b/openssl_source/zlib/1.3.1/000_zutil.patch @@ -0,0 +1,15 @@ +diff -urN zlib-1.3.1.orig/zutil.h zlib-1.3.1/zutil.h +--- zlib-1.3.1.orig/zutil.h 2024-01-22 09:39:42.000000000 +1000 ++++ zlib-1.3.1/zutil.h 2024-01-22 12:51:00.908632154 +1000 +@@ -42,6 +42,11 @@ typedef unsigned short ush; + typedef ush FAR ushf; + typedef unsigned long ulg; + ++/* 32 bit HP/UX compiler we use won't handle the large constants below */ ++#if defined(__hpux) && !defined(__LP64__) ++# define Z_U8 0xffffffffffffffff ++#endif ++ + #if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC) + # include + # if (ULONG_MAX == 0xffffffffffffffff) From befae9bfbf6cb5ca89a17c540e516b2e587dc9ae Mon Sep 17 00:00:00 2001 From: Robin Dubey Date: Tue, 2 Dec 2025 22:04:09 +0530 Subject: [PATCH 2/5] Modified to be more close to ICC repo Signed-off-by: Robin Dubey --- icc/zlib.mk | 3 --- .../zlib/1.3.1/{000_zutil.patch => 000_HPUX32.patch} | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) rename openssl_source/zlib/1.3.1/{000_zutil.patch => 000_HPUX32.patch} (58%) mode change 100644 => 100755 diff --git a/icc/zlib.mk b/icc/zlib.mk index 97388b4..f87ab65 100644 --- a/icc/zlib.mk +++ b/icc/zlib.mk @@ -76,12 +76,9 @@ zutil$(OBJSUFX): $(ZLIB_DIR)/zutil.c $(ZLIB_DIR)/zlib.h #- create_zlib: $(ZLIB_TAR) - if [ -e $(ZLIB_DIR) ] ; then rm -r $(ZLIB_DIR) ; fi [ -n "$(EX_SUFFIX)" ] || \ ( cd $(ICC_ROOT) ; \ tar xzf openssl_source/$(ZLIB_NAME).tar.gz ; \ - mkdir -p openssl_source/zlib/$(ZLIB_VER) ; \ - cp openssl_source/*.patch openssl_source/zlib/$(ZLIB_VER)/ 2>/dev/null || true ; \ ) [ -n "$(EX_SUFFIX)" ] || \ ( cd $(ICC_ROOT)/$(ZLIB_NAME) ; \ diff --git a/openssl_source/zlib/1.3.1/000_zutil.patch b/openssl_source/zlib/1.3.1/000_HPUX32.patch old mode 100644 new mode 100755 similarity index 58% rename from openssl_source/zlib/1.3.1/000_zutil.patch rename to openssl_source/zlib/1.3.1/000_HPUX32.patch index 5557f99..53984cf --- a/openssl_source/zlib/1.3.1/000_zutil.patch +++ b/openssl_source/zlib/1.3.1/000_HPUX32.patch @@ -1,7 +1,7 @@ -diff -urN zlib-1.3.1.orig/zutil.h zlib-1.3.1/zutil.h ---- zlib-1.3.1.orig/zutil.h 2024-01-22 09:39:42.000000000 +1000 -+++ zlib-1.3.1/zutil.h 2024-01-22 12:51:00.908632154 +1000 -@@ -42,6 +42,11 @@ typedef unsigned short ush; +diff -urN zlib-1.2.12.orig/zutil.h zlib-1.2.12/zutil.h +--- zlib-1.2.12.orig/zutil.h 2022-03-28 09:39:42.000000000 +1000 ++++ zlib-1.2.12/zutil.h 2022-04-27 12:51:00.908632154 +1000 +@@ -42,6 +42,11 @@ typedef ush FAR ushf; typedef unsigned long ulg; From 97724ec6558b2b5b44ecbc3990ac2e1aa3d95eed Mon Sep 17 00:00:00 2001 From: Robin Dubey Date: Wed, 3 Dec 2025 11:01:03 +0530 Subject: [PATCH 3/5] Revert changes for zlib.mk Signed-off-by: Robin Dubey --- icc/zlib.mk | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/icc/zlib.mk b/icc/zlib.mk index f87ab65..b71a238 100644 --- a/icc/zlib.mk +++ b/icc/zlib.mk @@ -18,7 +18,7 @@ ZLIB_TAR = $(ICC_ROOT)/openssl_source/$(ZLIB_NAME).tar.gz # EX_SUFFIX (=_ex) is defined to build from source already extracted from tar file and # checked into source control. This option is used by iSeries/OS400 for Clearcase builds. # removed zlib version from ZLIB_DIR so that the name does not keep changing so that MSVC projects are possible -ZLIB_DIR = $(ICC_ROOT)/openssl_source/zlib$(EX_SUFFIX) +ZLIB_DIR = $(ICC_ROOT)/zlib$(EX_SUFFIX) ZLIB_SRC = $(ZLIB_DIR)/adler32.c $(ZLIB_DIR)/compress.c $(ZLIB_DIR)/crc32.c \ $(ZLIB_DIR)/deflate.c $(ZLIB_DIR)/trees.c $(ZLIB_DIR)/zutil.c @@ -76,12 +76,17 @@ zutil$(OBJSUFX): $(ZLIB_DIR)/zutil.c $(ZLIB_DIR)/zlib.h #- create_zlib: $(ZLIB_TAR) + if [ -e $(ZLIB_DIR) ] ; then rm -r $(ZLIB_DIR) ; fi [ -n "$(EX_SUFFIX)" ] || \ - ( cd $(ICC_ROOT) ; \ - tar xzf openssl_source/$(ZLIB_NAME).tar.gz ; \ + ( cd .. ; \ + rm -rf x; mkdir x; cd x; \ + tar xzf $(ZLIB_TAR) ; \ + sleep 1 ; \ + mv $(ZLIB_NAME) $(ZLIB_DIR) ; \ + cd ..; \ ) [ -n "$(EX_SUFFIX)" ] || \ - ( cd $(ICC_ROOT)/$(ZLIB_NAME) ; \ - sh $(ICC_ROOT)/openssl_source/tools/patchem2 "$(ICC_ROOT)/openssl_source/zlib/$(ZLIB_VER)" ; \ + ( cd $(ZLIB_DIR); \ + sh ../openssl_source/tools/patchem2 "../openssl_source/zlib/$(ZLIB_VER)" ;\ ) From 4dba0b349bc01e00a57b9d4046c98908a8a89318 Mon Sep 17 00:00:00 2001 From: Robin Dubey Date: Wed, 3 Dec 2025 11:03:46 +0530 Subject: [PATCH 4/5] extra patch file removed Signed-off-by: Robin Dubey --- openssl_source/000_zutil.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 openssl_source/000_zutil.patch diff --git a/openssl_source/000_zutil.patch b/openssl_source/000_zutil.patch deleted file mode 100644 index 5557f99..0000000 --- a/openssl_source/000_zutil.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN zlib-1.3.1.orig/zutil.h zlib-1.3.1/zutil.h ---- zlib-1.3.1.orig/zutil.h 2024-01-22 09:39:42.000000000 +1000 -+++ zlib-1.3.1/zutil.h 2024-01-22 12:51:00.908632154 +1000 -@@ -42,6 +42,11 @@ typedef unsigned short ush; - typedef ush FAR ushf; - typedef unsigned long ulg; - -+/* 32 bit HP/UX compiler we use won't handle the large constants below */ -+#if defined(__hpux) && !defined(__LP64__) -+# define Z_U8 0xffffffffffffffff -+#endif -+ - #if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC) - # include - # if (ULONG_MAX == 0xffffffffffffffff) From b858cf7f3762f5ef578f54c9d2fc2ac4615c2f24 Mon Sep 17 00:00:00 2001 From: Robin Dubey Date: Wed, 3 Dec 2025 11:27:08 +0530 Subject: [PATCH 5/5] generic message added to address Failed: out.sh issue Signed-off-by: Robin Dubey --- icc/ICCencapsulator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icc/ICCencapsulator.java b/icc/ICCencapsulator.java index ab197b3..155b696 100644 --- a/icc/ICCencapsulator.java +++ b/icc/ICCencapsulator.java @@ -409,7 +409,7 @@ public static void main(String[] args) doWork(new File_one_sh()); // one.sh } catch (FileNotFoundException e) { - System.out.println("Failed: out.sh"); + System.out.println(e.getMessage()); // ignore }