From 78835cc6ede7ceb7d9607ea7bf42fe4710a4eb4f Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Thu, 1 Feb 2024 09:46:55 +0100 Subject: [PATCH 01/30] Remove obsolete script Signed-off-by: Martin Zeithaml --- build/build_configmgr.sh | 112 --------------------------------------- 1 file changed, 112 deletions(-) delete mode 100755 build/build_configmgr.sh diff --git a/build/build_configmgr.sh b/build/build_configmgr.sh deleted file mode 100755 index 3a3e8ca40..000000000 --- a/build/build_configmgr.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -# This program and the accompanying materials are -# made available under the terms of the Eclipse Public License v2.0 which accompanies -# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html -# -# SPDX-License-Identifier: EPL-2.0 -# -# Copyright Contributors to the Zowe Project. - -WORKING_DIR=$(dirname "$0") - - -echo "********************************************************************************" -echo "Building configmgr..." - -rm -f "${COMMON}/bin/configmgr" - -mkdir -p "${WORKING_DIR}/tmp-configmgr" && cd "$_" -COMMON="../.." - -LIBYAML="libyaml" -MAJOR=0 -MINOR=2 -PATCH=5 -VERSION="\"${MAJOR}.${MINOR}.${PATCH}\"" - -if [ ! -d "${LIBYAML}" ]; then - git clone git@github.com:yaml/libyaml.git -fi - -export _C89_ACCEPTABLE_RC=0 - -if ! c89 \ - -c \ - -Wc,dll,expo,langlvl\(extc99\),gonum,goff,hgpr,roconst,ASM,asmlib\('CEE.SCEEMAC','SYS1.MACLIB','SYS1.MODGEN'\) \ - -Wc,agg,list\(\),so\(\),off,xref \ - -Wc,ascii,noxplink \ - -D_ENHANCED_ASCII_EXT=0xFFFFFFFF \ - -DYAML_VERSION_MAJOR="${MAJOR}" \ - -DYAML_VERSION_MINOR="${MINOR}" \ - -DYAML_VERSION_PATCH="${PATCH}" \ - -DYAML_VERSION_STRING="${VERSION}" \ - -I "${LIBYAML}/include" \ - ${LIBYAML}/src/api.c \ - ${LIBYAML}/src/reader.c \ - ${LIBYAML}/src/scanner.c \ - ${LIBYAML}/src/parser.c \ - ${LIBYAML}/src/loader.c \ - ${LIBYAML}/src/writer.c \ - ${LIBYAML}/src/emitter.c \ - ${LIBYAML}/src/dumper.c -then - echo "Build failed" - exit 8 -fi - -if c89 \ - -D_XOPEN_SOURCE=600 \ - -DNOIBMHTTP=1 \ - -D_OPEN_THREADS=1 \ - -Wc,dll,expo,langlvl\(extc99\),gonum,goff,hgpr,roconst,ASM,asmlib\('CEE.SCEEMAC','SYS1.MACLIB','SYS1.MODGEN'\) \ - -Wc,agg,exp,list\(\),so\(\),off,xref \ - -Wl,dll \ - -I "${COMMON}/h" \ - -I "${COMMON}/platform/posix" \ - -I "${LIBYAML}/include" \ - -o "${COMMON}/bin/configmgr" \ - api.o \ - reader.o \ - scanner.o \ - parser.o \ - loader.o \ - writer.o \ - emitter.o \ - dumper.o \ - ${COMMON}/c/alloc.c \ - ${COMMON}/c/bpxskt.c \ - ${COMMON}/c/charsets.c \ - ${COMMON}/c/collections.c \ - ${COMMON}/c/configmgr.c \ - ${COMMON}/c/json.c \ - ${COMMON}/c/jsonschema.c \ - ${COMMON}/c/le.c \ - ${COMMON}/c/logging.c \ - ${COMMON}/platform/posix/psxregex.c \ - ${COMMON}/c/recovery.c \ - ${COMMON}/c/scheduling.c \ - ${COMMON}/c/timeutls.c \ - ${COMMON}/c/utils.c \ - ${COMMON}/c/xlate.c \ - ${COMMON}/c/yaml2json.c \ - ${COMMON}/c/zos.c \ - ${COMMON}/c/zosfile.c -then - echo "Build successful" - exit 0 -else - # remove configmgr in case the linker had RC=4 and produced the binary - rm -f "${COMMON}/bin/configmgr" - echo "Build failed" - exit 8 -fi - - -# This program and the accompanying materials are -# made available under the terms of the Eclipse Public License v2.0 which accompanies -# this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html -# -# SPDX-License-Identifier: EPL-2.0 -# -# Copyright Contributors to the Zowe Project. \ No newline at end of file From 492bfabf93880bb4efe1ead373a6cbbcee8e78da Mon Sep 17 00:00:00 2001 From: Zowe Robot Date: Wed, 21 Feb 2024 13:27:14 +0000 Subject: [PATCH 02/30] Update changelog with PR #423 description Signed-off-by: Zowe Robot --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 343f5ab95..3cdca8d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Zowe Common C Changelog +## `2.15.0` +- Remove obsolete building script build_configmgr.sh (#410). (#423) + ## `2.13.0` - Added support for using "zowe.network" and "components.zss.zowe.network" to set TLS version properties. (#411) - Added utility for general usage returning the name of External Security Manager From 2c405394cb9cf2bbc5eca383fe8178113c382f69 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 21 Feb 2024 08:39:27 -0500 Subject: [PATCH 03/30] Added function calls to configmgr qjs zos for use in zwe Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 3 +++ build/configmgr.proj.env | 4 ++-- c/qjszos.c | 41 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 343f5ab95..1f6e523fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Zowe Common C Changelog +## `2.16.0` +- Added `zos.getZosVersion()` and `zos.getEsm()` calls for configmgr QJS (#429) + ## `2.13.0` - Added support for using "zowe.network" and "components.zss.zowe.network" to set TLS version properties. (#411) - Added utility for general usage returning the name of External Security Manager diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 667834e79..9c6685fdf 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -3,8 +3,8 @@ VERSION=2.15.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" -QUICKJS_SOURCE="git@github.com:joenemo/quickjs-portable.git" -QUICKJS_BRANCH="main" +QUICKJS_SOURCE="git@github.com:Martin-Zeithaml/quickjs-portable.git" +QUICKJS_BRANCH="tagFile" LIBYAML="libyaml" LIBYAML_SOURCE="git@github.com:yaml/libyaml.git" diff --git a/c/qjszos.c b/c/qjszos.c index d62529013..9fbb258e7 100644 --- a/c/qjszos.c +++ b/c/qjszos.c @@ -154,6 +154,41 @@ static JSValue zosChangeStreamCCSID(JSContext *ctx, JSValueConst this_val, return JS_NewInt64(ctx,(int64_t)status); } +static JSValue getZosVersion(JSContext *ctx, JSValueConst this_val, + int argc, JSValueConst *argv){ + +#ifdef __ZOWE_OS_ZOS + ECVT *ecvt = getECVT(); + int version = ecvt->ecvtpseq; +#else + int version = -1; +#endif + return JS_NewInt64(ctx,(int64_t)version); +} + + +static JSValue getEsm(JSContext *ctx, JSValueConst this_val, + int argc, JSValueConst *argv){ + +#ifdef __ZOWE_OS_ZOS + switch(getExternalSecurityManager()) { + case ZOS_ESM_RTSS: + return newJSStringFromNative(ctx, "TSS", 3); + case ZOS_ESM_RACF: + return newJSStringFromNative(ctx, "RACF", 4); + case ZOS_ESM_ACF2: + return newJSStringFromNative(ctx, "ACF2", 4); + case ZOS_ESM_NONE: + return newJSStringFromNative(ctx, "NONE", 4); + default: + return JS_NewString(ctx, NULL); + } +#else + return JS_NewString(ctx, NULL); +#endif + +} + /* return [obj, errcode] */ static JSValue zosStat(JSContext *ctx, JSValueConst this_val, @@ -377,6 +412,10 @@ static const char changeStreamCCSIDASCII[18] ={ 0x63, 0x68, 0x61, 0x6e, 0x67, 0x 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x43, 0x43, 0x53, 0x49, 0x44, 0x00}; static const char zstatASCII[6] ={ 0x7A, 0x73, 0x74, 0x61, 0x74, 0}; +static const char getZosVersionASCII[14] ={ 0x67, 0x65, 0x74, 0x5A, 0x6F, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6F, 0x6E, 0x00}; + +static const char getEsmASCII[7] = { 0x67, 0x65, 0x74, 0x45, 0x73, 0x6D, 0x00 }; + static const char EXTATTR_SHARELIB_ASCII[17] = { 0x45, 0x58, 0x54, 0x41, 0x54, 0x54, 0x52, 0x5f, 0x53, 0x48, 0x41, 0x52, 0x45, 0x4c, 0x49, 0x42, 0x0}; @@ -398,6 +437,8 @@ static const JSCFunctionListEntry zosFunctions[] = { JS_CFUNC_DEF(changeExtAttrASCII, 3, zosChangeExtAttr), JS_CFUNC_DEF(changeStreamCCSIDASCII, 2, zosChangeStreamCCSID), JS_CFUNC_DEF(zstatASCII, 1, zosStat), + JS_CFUNC_DEF(zosVersionASCII, 0, getZosVersion), + JS_CFUNC_DEF(getEsmASCII, 0, getEsm), JS_CFUNC_DEF(dslistASCII, 1, zosDatasetInfo), JS_CFUNC_DEF(resolveSymbolASCII, 1, zosResolveSymbol), JS_PROP_INT32_DEF(EXTATTR_SHARELIB_ASCII, EXTATTR_SHARELIB, JS_PROP_CONFIGURABLE ), From f3d62b2ce3195a2af915fd33e5c53a7de62122fa Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 21 Feb 2024 08:43:35 -0500 Subject: [PATCH 04/30] Fix mislabeled function name Signed-off-by: 1000TurquoisePogs --- c/qjszos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c/qjszos.c b/c/qjszos.c index 9fbb258e7..f2cf738d8 100644 --- a/c/qjszos.c +++ b/c/qjszos.c @@ -437,7 +437,7 @@ static const JSCFunctionListEntry zosFunctions[] = { JS_CFUNC_DEF(changeExtAttrASCII, 3, zosChangeExtAttr), JS_CFUNC_DEF(changeStreamCCSIDASCII, 2, zosChangeStreamCCSID), JS_CFUNC_DEF(zstatASCII, 1, zosStat), - JS_CFUNC_DEF(zosVersionASCII, 0, getZosVersion), + JS_CFUNC_DEF(getZosVersionASCII, 0, getZosVersion), JS_CFUNC_DEF(getEsmASCII, 0, getEsm), JS_CFUNC_DEF(dslistASCII, 1, zosDatasetInfo), JS_CFUNC_DEF(resolveSymbolASCII, 1, zosResolveSymbol), From c8646d09e4f61799a479a0772941f58657d2707d Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Fri, 1 Mar 2024 07:56:53 -0500 Subject: [PATCH 05/30] Correcting the sign off issue and recommitting the fix Signed-off-by: Gautham Kuppuswamy --- CHANGELOG.md | 3 +++ c/httpserver.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cdca8d83..dc8268c97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Zowe Common C Changelog +## `2.16.0` +- For correct base64 encoding scheme the buffer size is made to be divisble by 3 (#431). + ## `2.15.0` - Remove obsolete building script build_configmgr.sh (#410). (#423) diff --git a/c/httpserver.c b/c/httpserver.c index 109666951..d94599be7 100644 --- a/c/httpserver.c +++ b/c/httpserver.c @@ -4637,8 +4637,9 @@ static int streamBinaryForFile2(HttpResponse *response, Socket *socket, UnixFile if (encoding == ENCODING_CHUNKED) { stream = makeChunkedOutputStreamInternal(response); } - - int bufferSize = FILE_STREAM_BUFFER_SIZE; + + // To make bufferSize divisble by 3 for correct base64 encoding. + int bufferSize = FILE_STREAM_BUFFER_SIZE - (FILE_STREAM_BUFFER_SIZE % 3); char *buffer = safeMalloc(bufferSize+4, "streamBinaryBuffer"); int encodedLength; @@ -4710,7 +4711,8 @@ static int streamTextForFile2(HttpResponse *response, Socket *socket, UnixFile * stream = makeChunkedOutputStreamInternal(response); /* fallthrough */ case ENCODING_SIMPLE: { - int bufferSize = FILE_STREAM_BUFFER_SIZE; + // To make bufferSize divisble by 3 for correct base64 encoding. + int bufferSize = FILE_STREAM_BUFFER_SIZE - (FILE_STREAM_BUFFER_SIZE % 3); char *buffer = safeMalloc(bufferSize+4, "streamTextBuffer"); char *translation = safeMalloc((2*bufferSize)+4, "streamTextConvertBuffer"); /* UTF inflation tolerance */ int encodedLength; From 54bbc53cb0cb39845778f7d88819a9ba28b3ae17 Mon Sep 17 00:00:00 2001 From: Irek Fakhrutdinov Date: Mon, 4 Mar 2024 16:32:04 +0100 Subject: [PATCH 06/30] Take into account leap seconds in xmem messages' timestamps Signed-off-by: Irek Fakhrutdinov --- CHANGELOG.md | 2 ++ c/crossmemory.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc8268c97..36f1c67c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,11 @@ ## `2.16.0` - For correct base64 encoding scheme the buffer size is made to be divisble by 3 (#431). +- Take into account leap seconds in xmem log messages' timestamps (#432, #433) ## `2.15.0` - Remove obsolete building script build_configmgr.sh (#410). (#423) +- Add flags to avoid linkage-stack queries in the recovery facility (#404, #412) ## `2.13.0` - Added support for using "zowe.network" and "components.zss.zowe.network" to set TLS version properties. (#411) diff --git a/c/crossmemory.c b/c/crossmemory.c index f5f47c673..d7f132f17 100644 --- a/c/crossmemory.c +++ b/c/crossmemory.c @@ -510,19 +510,27 @@ static void getSTCK(uint64 *stckValue) { __asm(" STCK 0(%0)" : : "r"(stckValue)); } -int64 getLocalTimeOffset() { +static int64 getLocalTimeOffset(void) { CVT * __ptr32 cvt = *(void * __ptr32 * __ptr32)0x10; void * __ptr32 cvtext2 = cvt->cvtext2; int64 *cvtldto = (int64 * __ptr32)(cvtext2 + 0x38); return *cvtldto; } +static int64 getLeapSecondsOffset(void) { + CVT * __ptr32 cvt = *(void * __ptr32 * __ptr32)0x10; + void * __ptr32 cvtext2 = cvt->cvtext2; + int64 *cvtlso = (int64 * __ptr32)(cvtext2 + 0x50); + return *cvtlso; +} + static void getCurrentLogTimestamp(LogTimestamp *timestamp) { uint64 stck = 0; getSTCK(&stck); stck += getLocalTimeOffset(); + stck -= getLeapSecondsOffset(); stckToLogTimestamp(stck, timestamp); From 2732079378aff256d07376738de84c0b95e31e80 Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Tue, 12 Mar 2024 06:39:16 -0400 Subject: [PATCH 07/30] Using a temporary buffer pointer to avoid corrupting the original pointer used for malloc Signed-off-by: Gautham Kuppuswamy --- CHANGELOG.md | 1 + c/httpfileservice.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36f1c67c4..3cbf1b9a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## `2.16.0` - For correct base64 encoding scheme the buffer size is made to be divisble by 3 (#431). - Take into account leap seconds in xmem log messages' timestamps (#432, #433) +- Using a temporary buffer pointer to avoid pointer corruption during file write (#437). ## `2.15.0` - Remove obsolete building script build_configmgr.sh (#410). (#423) diff --git a/c/httpfileservice.c b/c/httpfileservice.c index b383b9f59..48e5d2a1b 100644 --- a/c/httpfileservice.c +++ b/c/httpfileservice.c @@ -935,11 +935,12 @@ int writeAsciiDataFromBase64(UnixFile *file, char *fileContents, int contentLeng &reasonCode); if (status == 0) { int writtenLength = 0; + char *dataToWriteToFile = dataToWrite; while (dataSize != 0) { - writtenLength = fileWrite(file, dataToWrite, dataSize, &returnCode, &reasonCode); + writtenLength = fileWrite(file, dataToWriteToFile, dataSize, &returnCode, &reasonCode); if (writtenLength >= 0) { dataSize -= writtenLength; - dataToWrite -= writtenLength; + dataToWriteToFile += writtenLength; } else { zowelog(NULL, LOG_COMP_RESTFILE, ZOWE_LOG_DEBUG, "Error writing to file: return: %d, rsn: %d.\n", returnCode, reasonCode); From f3203cf1da579b7f89fa41fe6848857391a9bfbd Mon Sep 17 00:00:00 2001 From: Jordan Filteau Date: Tue, 12 Mar 2024 11:19:53 -0500 Subject: [PATCH 08/30] changing certificate logging from info to debug Signed-off-by: Jordan Filteau --- c/httpserver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/c/httpserver.c b/c/httpserver.c index d94599be7..d94875de0 100644 --- a/c/httpserver.c +++ b/c/httpserver.c @@ -3210,10 +3210,10 @@ static int serviceAuthNativeWithSessionToken(HttpService *service, HttpRequest * request->flags = HTTP_REQUEST_NO_PASSWORD; authDataFound = TRUE; } else { - zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_INFO, "No user was found for client certificate. (rc = 0x%x racfRC = 0x%x racfRSN = 0x%x)\n", safReturnCode, racfReturnCode, racfReasonCode); + zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "No user was found for client certificate. (rc = 0x%x racfRC = 0x%x racfRSN = 0x%x)\n", safReturnCode, racfReturnCode, racfReasonCode); } } else { - zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_INFO, "Client certificate was attached to request, but credentials are also attached. Server won't attempt to map the client certificate.\n"); + zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG, "Client certificate was attached to request, but credentials are also attached. Server won't attempt to map the client certificate.\n"); } } From 531a0d9e25aaa320051b55a7bb6cc870b4ba6ac7 Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Wed, 13 Mar 2024 12:23:12 -0400 Subject: [PATCH 09/30] Renaming the temporary pointer Signed-off-by: Gautham Kuppuswamy --- c/httpfileservice.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/c/httpfileservice.c b/c/httpfileservice.c index 48e5d2a1b..45d35baa4 100644 --- a/c/httpfileservice.c +++ b/c/httpfileservice.c @@ -935,12 +935,12 @@ int writeAsciiDataFromBase64(UnixFile *file, char *fileContents, int contentLeng &reasonCode); if (status == 0) { int writtenLength = 0; - char *dataToWriteToFile = dataToWrite; + char *currentBufferStart = dataToWrite; while (dataSize != 0) { - writtenLength = fileWrite(file, dataToWriteToFile, dataSize, &returnCode, &reasonCode); + writtenLength = fileWrite(file, currentBufferStart, dataSize, &returnCode, &reasonCode); if (writtenLength >= 0) { dataSize -= writtenLength; - dataToWriteToFile += writtenLength; + currentBufferStart += writtenLength; } else { zowelog(NULL, LOG_COMP_RESTFILE, ZOWE_LOG_DEBUG, "Error writing to file: return: %d, rsn: %d.\n", returnCode, reasonCode); From fdde13e02ad00c31d471b3dea08b2c3860877fb4 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Wed, 20 Mar 2024 12:44:48 +0100 Subject: [PATCH 10/30] Min member name length = 1 Signed-off-by: Martin Zeithaml --- c/configmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c/configmgr.c b/c/configmgr.c index 512ec30fa..a2c49bd5b 100644 --- a/c/configmgr.c +++ b/c/configmgr.c @@ -773,7 +773,7 @@ int cfgSetParmlibMemberName(ConfigManager *mgr, const char *configName, const ch CFGConfig *config = getConfig(mgr,configName); if (config){ int len = strlen(parmlibMemberName); - if (len < 3 || len > PARMLIB_MEMBER_MAX){ + if (len < 1 || len > PARMLIB_MEMBER_MAX){ return ZCFG_BAD_PARMLIB_MEMBER_NAME; } else { config->parmlibMemberName = substring(mgr,(char*)parmlibMemberName,0,len); From 41e9f59fda7e7178620a3b40b5f24ff3c3405e11 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 20 Mar 2024 14:43:04 -0400 Subject: [PATCH 11/30] Switch to qjs fork that has a potential fix for sleeping Signed-off-by: 1000TurquoisePogs --- build/configmgr.proj.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 9c6685fdf..6b70680bc 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -3,8 +3,8 @@ VERSION=2.15.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" -QUICKJS_SOURCE="git@github.com:Martin-Zeithaml/quickjs-portable.git" -QUICKJS_BRANCH="tagFile" +QUICKJS_SOURCE="git@github.com:1000TurquoisePogs/quickjs-portable.git" +QUICKJS_BRANCH="bugfix/os-sleep" LIBYAML="libyaml" LIBYAML_SOURCE="git@github.com:yaml/libyaml.git" From 1bad6d43d63a4b794694feef0cbdc41ec05b4cb8 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 22 Mar 2024 14:06:11 -0400 Subject: [PATCH 12/30] Update build-configmgr.yml Signed-off-by: 1000TurquoisePogs --- .github/workflows/build-configmgr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-configmgr.yml b/.github/workflows/build-configmgr.yml index 548169160..31f5fc3f4 100644 --- a/.github/workflows/build-configmgr.yml +++ b/.github/workflows/build-configmgr.yml @@ -126,9 +126,9 @@ jobs: - name: '[Dep 2] Quickjs' uses: actions/checkout@v3 with: - repository: joenemo/quickjs-portable + repository: 1000turquoisepogs/quickjs-portable path: deps/configmgr/quickjs - ref: 'main' + ref: 'bugfix/os-sleep' - name: '[Prep 2] Setup jFrog CLI' uses: jfrog/setup-jfrog-cli@v2 From b9920361e1a65c6021f258ec74291d33abfb5953 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 26 Mar 2024 16:22:09 +0100 Subject: [PATCH 13/30] isSyntacticallyBool update Signed-off-by: Martin Zeithaml --- c/yaml2json.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/c/yaml2json.c b/c/yaml2json.c index aabc08210..d1c28ce2b 100644 --- a/c/yaml2json.c +++ b/c/yaml2json.c @@ -380,7 +380,9 @@ static bool isSyntacticallyInteger(yaml_char_t *data, int length){ } static bool isSyntacticallyBool(yaml_char_t *data, int length){ - if ((length == 4) && + if (length == 0) { + return true + } else if ((length == 4) && (!memcmp(data,"true",4) || !memcmp(data,"True",4) || !memcmp(data,"TRUE",4))){ From cf6baeed4326d12759983c6d69f89a82a91415e7 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Tue, 26 Mar 2024 16:26:42 +0100 Subject: [PATCH 14/30] isSyntacticallyNull update Signed-off-by: Martin Zeithaml --- c/yaml2json.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/c/yaml2json.c b/c/yaml2json.c index d1c28ce2b..9af3e5239 100644 --- a/c/yaml2json.c +++ b/c/yaml2json.c @@ -380,9 +380,7 @@ static bool isSyntacticallyInteger(yaml_char_t *data, int length){ } static bool isSyntacticallyBool(yaml_char_t *data, int length){ - if (length == 0) { - return true - } else if ((length == 4) && + if ((length == 4) && (!memcmp(data,"true",4) || !memcmp(data,"True",4) || !memcmp(data,"TRUE",4))){ @@ -398,7 +396,9 @@ static bool isSyntacticallyBool(yaml_char_t *data, int length){ } static bool isSyntacticallyNull(yaml_char_t *data, int length){ - if ((length == 1) && + if (length == 0 ) { + return true; + } else if ((length == 1) && !memcmp(data,"~",1)){ return true; } else if ((length == 4) && From 328b263e8da1f00e47911cc6d8b32fb0a1d72efc Mon Sep 17 00:00:00 2001 From: Zowe Robot Date: Tue, 26 Mar 2024 15:38:47 +0000 Subject: [PATCH 15/30] Update changelog with PR #442 description Signed-off-by: Zowe Robot --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cbf1b9a7..2d3812e85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Zowe Common C Changelog +## `2.15.1` +- No yaml value converted to null (#442) + ## `2.16.0` - For correct base64 encoding scheme the buffer size is made to be divisble by 3 (#431). - Take into account leap seconds in xmem log messages' timestamps (#432, #433) From 3c74d9ea82cf499c54458881c5b6c27d59d8ad82 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 27 Mar 2024 15:08:10 -0400 Subject: [PATCH 16/30] Revert to main branch now that features merged Signed-off-by: 1000TurquoisePogs --- build/configmgr.proj.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 6b70680bc..007e20a30 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -3,8 +3,8 @@ VERSION=2.15.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" -QUICKJS_SOURCE="git@github.com:1000TurquoisePogs/quickjs-portable.git" -QUICKJS_BRANCH="bugfix/os-sleep" +QUICKJS_SOURCE="git@github.com:JoeNemo/quickjs-portable.git" +QUICKJS_BRANCH="main" LIBYAML="libyaml" LIBYAML_SOURCE="git@github.com:yaml/libyaml.git" From b8324a44a7e03a7188ee1abd98ab9ae806ff82bb Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Wed, 27 Mar 2024 15:08:53 -0400 Subject: [PATCH 17/30] Revert to main branch now that features merged Signed-off-by: 1000TurquoisePogs --- .github/workflows/build-configmgr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-configmgr.yml b/.github/workflows/build-configmgr.yml index 31f5fc3f4..1f94fb246 100644 --- a/.github/workflows/build-configmgr.yml +++ b/.github/workflows/build-configmgr.yml @@ -126,9 +126,9 @@ jobs: - name: '[Dep 2] Quickjs' uses: actions/checkout@v3 with: - repository: 1000turquoisepogs/quickjs-portable + repository: JoeNemo/quickjs-portable path: deps/configmgr/quickjs - ref: 'bugfix/os-sleep' + ref: 'main' - name: '[Prep 2] Setup jFrog CLI' uses: jfrog/setup-jfrog-cli@v2 From 5c16710994714236614ede7f142af0376f7df3ad Mon Sep 17 00:00:00 2001 From: struga0258 Date: Wed, 17 Apr 2024 13:31:00 +0000 Subject: [PATCH 18/30] v2.16.0 Signed-off-by: struga0258 --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 007e20a30..bbbf917c8 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.15.0 +VERSION=2.16.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index 9119377fa..0f7d7f54d 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.15.0 +VERSION=2.16.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index 47f5fe677..56a21f1f9 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.15.0 +version: 2.16.0 homepage: https://zowe.org keywords: From 03236a391ac5bfde9b1ef3aeb38d20c77544dd63 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:18:37 +0200 Subject: [PATCH 19/30] Update CHANGELOG.md Signed-off-by: Martin Zeithaml <66114686+Martin-Zeithaml@users.noreply.github.com> --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b96e36e7..2d7aa2223 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,7 @@ # Zowe Common C Changelog -## `2.15.1` -- No yaml value converted to null (#442) - ## `2.16.0` +- No yaml value converted to null (#442) - Added `zos.getZosVersion()` and `zos.getEsm()` calls for configmgr QJS (#429) - For correct base64 encoding scheme the buffer size is made to be divisble by 3 (#431). - Take into account leap seconds in xmem log messages' timestamps (#432, #433) From 9bd63666541a2fb6d571c5bd322d68eb249b80fb Mon Sep 17 00:00:00 2001 From: MarkAckert Date: Fri, 10 May 2024 16:42:33 +0000 Subject: [PATCH 20/30] v2.17.0 Signed-off-by: MarkAckert --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index bbbf917c8..7e741350e 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.16.0 +VERSION=2.17.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index 0f7d7f54d..a47c9045c 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.16.0 +VERSION=2.17.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index 56a21f1f9..8796bb058 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.16.0 +version: 2.17.0 homepage: https://zowe.org keywords: From d2d63086b2a43bb93a6edabcc2aa0e9b082bb260 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Fri, 17 May 2024 15:06:36 +0200 Subject: [PATCH 21/30] Return error for wrong file Signed-off-by: Martin Zeithaml --- c/embeddedjs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/c/embeddedjs.c b/c/embeddedjs.c index aad75a32d..bbbb6fac7 100644 --- a/c/embeddedjs.c +++ b/c/embeddedjs.c @@ -626,7 +626,14 @@ static JSValue xplatformLoadFileUTF8(JSContext *ctx, JSValueConst this_val, JS_ToInt32(ctx, &sourceCCSID, argv[1]); buf = (char*)js_load_file(ctx, &length, filename); - + if (!buf) { + size_t filenameNativeLen = strlen(filename); + char filenameNative[filenameNativeLen + 1]; + snprintf(filenameNative, filenameNativeLen + 1, "%.*s", (int)filenameNativeLen, filename); + convertToNative(filenameNative, (int)filenameNativeLen); + perror(filenameNative); + return JS_EXCEPTION; + } if (sourceCCSID < 0){ char *nativeBuffer = safeMalloc(length+1,"xplatformStringFromBytes"); memcpy(nativeBuffer,buf,length); From 37677a60ea4976262390a05b00a62ed2369e1165 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Mon, 20 May 2024 09:42:49 +0200 Subject: [PATCH 22/30] Remove unused vars and error consistent Signed-off-by: Martin Zeithaml --- c/embeddedjs.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/c/embeddedjs.c b/c/embeddedjs.c index bbbb6fac7..e2697fc0d 100644 --- a/c/embeddedjs.c +++ b/c/embeddedjs.c @@ -612,7 +612,6 @@ uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename); /* (filename, ccsid) ccsid -1 implies guess best for platform, 0 implies don't translate */ static JSValue xplatformLoadFileUTF8(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv){ - size_t size; size_t length; char *buf; @@ -627,11 +626,6 @@ static JSValue xplatformLoadFileUTF8(JSContext *ctx, JSValueConst this_val, buf = (char*)js_load_file(ctx, &length, filename); if (!buf) { - size_t filenameNativeLen = strlen(filename); - char filenameNative[filenameNativeLen + 1]; - snprintf(filenameNative, filenameNativeLen + 1, "%.*s", (int)filenameNativeLen, filename); - convertToNative(filenameNative, (int)filenameNativeLen); - perror(filenameNative); return JS_EXCEPTION; } if (sourceCCSID < 0){ @@ -685,7 +679,6 @@ static int appendToFile(char *filename, const char *data, int length) { /* (filename, ccsid) ccsid -1 implies guess best for platform, 0 implies don't translate */ static JSValue xplatformAppendFileUTF8(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv){ - size_t size; size_t length; NATIVE_STR(filename,nativeFilename,0); @@ -725,7 +718,6 @@ static JSValue xplatformAppendFileUTF8(JSContext *ctx, JSValueConst this_val, /* (filename, ccsid) ccsid -1 implies guess best for platform, 0 implies don't translate */ static JSValue xplatformStoreFileUTF8(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv){ - size_t size; size_t length; NATIVE_STR(filename,nativeFilename,0); From 8b37e0536934d0f18dcb281595e815bdef560199 Mon Sep 17 00:00:00 2001 From: Martin Zeithaml Date: Mon, 20 May 2024 09:50:42 +0200 Subject: [PATCH 23/30] Changelog note Signed-off-by: Martin Zeithaml --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d7aa2223..47c6c5f13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Zowe Common C Changelog +## `2.17.0` +- Fixed `xplatform.loadFileUTF8` when trying to open nonexistent file (#454) + ## `2.16.0` - No yaml value converted to null (#442) - Added `zos.getZosVersion()` and `zos.getEsm()` calls for configmgr QJS (#429) From 1ecbdb4b3fd0bd28f5a8cf0b78d0f29536a41bfb Mon Sep 17 00:00:00 2001 From: Irek Fakhrutdinov Date: Tue, 7 May 2024 16:48:16 +0200 Subject: [PATCH 24/30] Fix an incorrect check in the recovery router The recovery facility might erroneously free the state cell-pool if an ABEND occurs right after the ESTAEX has been set but before any recovery states with the retry option have been pushed; this issued is caused by an incorrectly coded check in the recovery router code (the check is inverted). The commit fixes the incorrect instruction and adds some code to leave "bread crumbs" when the state cell-pool is deleted. Fixes: #446 Signed-off-by: Irek Fakhrutdinov --- CHANGELOG.md | 2 ++ c/recovery.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47c6c5f13..6ac745a0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## `2.17.0` - Fixed `xplatform.loadFileUTF8` when trying to open nonexistent file (#454) +- Bugfix: fix an incorrect check in the recovery router code which might lead to + the state cell-pool being released prematurely (#446) ## `2.16.0` - No yaml value converted to null (#442) diff --git a/c/recovery.c b/c/recovery.c index fd1ff5611..2c5da2a0a 100644 --- a/c/recovery.c +++ b/c/recovery.c @@ -497,7 +497,7 @@ static void * __ptr32 getRecoveryRouterAddress() { " LA 1,RCVXINF LOAD ROUTER SERVICE INFO \n" " BRAS 14,RCVSIFLB RECORD IT, REMOVE CONTEXT, PERCOLATE \n" " TM RCXFLAG1,R@CF1USP USER STATE POOL? \n" - " BZ RCVFRL04 NO, DO NOT FREE IT \n" + " BNZ RCVFRL04 NO, DO NOT FREE IT \n" " LT 2,RCXSCPID CELL POOL ZERO? \n" " BZ RCVFRL04 YES, DO NOT FREE IT \n" #ifdef _LP64 @@ -505,6 +505,8 @@ static void * __ptr32 getRecoveryRouterAddress() { " SYSSTATE AMODE64=NO \n" #endif " CPOOL DELETE,CPID=(2) FREE THE STATE CELL POOL \n" + " LGFI 2,X'7FFFFBA3' MAKE AN OBVIOUSLY BAD ADDRESS \n" + " ST 2,RCXSCPID MARK THE CPID FOR DEBUGGING PURPOSES \n" #ifdef _LP64 " SAM64 \n" " SYSSTATE AMODE64=YES \n" @@ -1291,6 +1293,8 @@ RecoveryStatePool *recoveryMakeStatePool(unsigned int stateCount) { void recoveryRemoveStatePool(RecoveryStatePool *statePool) { removeRecoveryStatePool(statePool->cellPool); + // put a bad address for debugging (in case the statePool storage survives) + statePool->cellPool = 0x7FFFFBA1; storageRelease(statePool, sizeof(RecoveryStatePool)); } From 7c0d765ae25e12421839b15cb89736f2c04afbf9 Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Thu, 30 May 2024 04:12:55 -0400 Subject: [PATCH 25/30] Allocate SLH blocks for httpserver with configure value, else default value. Signed-off-by: Gautham Kuppuswamy --- CHANGELOG.md | 1 + c/httpserver.c | 7 ++++++- h/httpserver.h | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ac745a0c..48b28cf58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fixed `xplatform.loadFileUTF8` when trying to open nonexistent file (#454) - Bugfix: fix an incorrect check in the recovery router code which might lead to the state cell-pool being released prematurely (#446) +- Allocating SLH for http server with configurable value 'httpRequestHeapMaxBlocks' in yaml (#447). ## `2.16.0` - No yaml value converted to null (#442) diff --git a/c/httpserver.c b/c/httpserver.c index d94875de0..c3cf7d9c5 100644 --- a/c/httpserver.c +++ b/c/httpserver.c @@ -1564,6 +1564,7 @@ HttpServer *makeHttpServerInner(STCBase *base, memcpy(&server->config->sessionTokenKey[0], &sessionTokenKey, sizeof (sessionTokenKey)); server->config->authTokenType = SERVICE_AUTH_TOKEN_TYPE_LEGACY; + server->config->httpRequestHeapMaxBlocks = HTTP_REQUEST_HEAP_DEFAULT_BLOCKS; return server; } @@ -1656,6 +1657,8 @@ static HttpServer *makeSecureHttpServerInner(STCBase *base, int port, int64 now = getFineGrainedTime(); server->config->sessionTokenKeySize = sizeof (now); memcpy(&server->config->sessionTokenKey[0], &now, sizeof (now)); + server->config->httpRequestHeapMaxBlocks = HTTP_REQUEST_HEAP_DEFAULT_BLOCKS; + return server; } #endif @@ -5821,7 +5824,9 @@ static int httpHandleTCP(STCBase *base, } } #endif // USE_ZOWE_TLS - ShortLivedHeap *slh = makeShortLivedHeap(READ_BUFFER_SIZE,100); + HttpServer *server = (HttpServer*) module->data; + unsigned int maxBlocks = server->config->httpRequestHeapMaxBlocks; + ShortLivedHeap *slh = makeShortLivedHeap(READ_BUFFER_SIZE, maxBlocks); #ifndef __ZOWE_OS_WINDOWS int writeBufferSize = 0x40000; setSocketWriteBufferSize(peerSocket,0x40000, &returnCode, &reasonCode); diff --git a/h/httpserver.h b/h/httpserver.h index 09f0d2de0..2cbbd6610 100644 --- a/h/httpserver.h +++ b/h/httpserver.h @@ -64,6 +64,10 @@ #define HTTP_SERVER_PRIVILEGED_SERVER_PROPERTY "zisServerName" +#define HTTP_REQUEST_HEAP_DEFAULT_BLOCKS 1024 +#define HTTP_REQUEST_HEAP_MIN_BLOCKS 100 +#define HTTP_REQUEST_HEAP_MAX_BLOCKS 4096 + typedef struct BigBuffer_tag{ ShortLivedHeap *slh; /* can be null */ char *data; @@ -220,6 +224,7 @@ typedef struct HTTPServerConfig_tag { hashtable *userTimeouts; hashtable *groupTimeouts; int defaultTimeout; + unsigned int httpRequestHeapMaxBlocks; /* The config manager is optional, but zss and other servers need a near-global way to get configuration data. */ From 4b71feef879087c7dcc04ba79482affe329b64ff Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Wed, 26 Jun 2024 14:06:29 -0400 Subject: [PATCH 26/30] Return error when last config file is non existent or has some error Signed-off-by: Gautham Kuppuswamy --- c/configmgr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/c/configmgr.c b/c/configmgr.c index a2c49bd5b..460ff60c8 100644 --- a/c/configmgr.c +++ b/c/configmgr.c @@ -827,6 +827,9 @@ static int overloadConfiguration(ConfigManager *mgr, trace(mgr, DEBUG2, "at end of config path\n"); bool dontCare = false; config->configData = readJson(mgr,config,pathElement,&dontCare); + if ((config->configData == NULL) && !dontCare){ + return ZCFG_MISSING_CONFIG_SOURCE; + } trace(mgr, DEBUG2, "mgr->config = 0x%p\n", config); return 0; /* success */ } else { From 78e946141710ad75e3d851938baf1f9e8246da46 Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Wed, 26 Jun 2024 15:02:33 -0400 Subject: [PATCH 27/30] Changelog updated Signed-off-by: Gautham Kuppuswamy --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48b28cf58..70dac3cd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Bugfix: fix an incorrect check in the recovery router code which might lead to the state cell-pool being released prematurely (#446) - Allocating SLH for http server with configurable value 'httpRequestHeapMaxBlocks' in yaml (#447). +- Return error when last config file is non existent or has some error (#460). ## `2.16.0` - No yaml value converted to null (#442) From 0c5a03b54d057b8b6cc45253637b3ed6dab971cd Mon Sep 17 00:00:00 2001 From: struga0258 Date: Mon, 1 Jul 2024 14:07:57 +0000 Subject: [PATCH 28/30] v2.18.0 Signed-off-by: struga0258 --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 7e741350e..cbc586eba 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index a47c9045c..1e4c463f5 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index 8796bb058..ecc3d9e45 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.17.0 +version: 2.18.0 homepage: https://zowe.org keywords: From 39b07136358481d8bdd6a1ffeb5b94ac08eebfd3 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 1 Jul 2024 10:36:20 -0400 Subject: [PATCH 29/30] Revert back version Signed-off-by: James Struga --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index cbc586eba..7e741350e 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.18.0 +VERSION=2.17.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index 1e4c463f5..a47c9045c 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.18.0 +VERSION=2.17.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index ecc3d9e45..8796bb058 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.18.0 +version: 2.17.0 homepage: https://zowe.org keywords: From 194623a65f095a2ae57c67c11d79992a0ec0e4a5 Mon Sep 17 00:00:00 2001 From: struga0258 Date: Wed, 24 Jul 2024 14:34:47 +0000 Subject: [PATCH 30/30] v2.18.0 Signed-off-by: struga0258 --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 7e741350e..cbc586eba 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index a47c9045c..1e4c463f5 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index 8796bb058..ecc3d9e45 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.17.0 +version: 2.18.0 homepage: https://zowe.org keywords: