Architecture specific change in rpms/acpica-tools.git
by githook-noreply@fedoraproject.org
The package rpms/acpica-tools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/acpica-tools.git/commit/?id=99f17....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit c88a2bebac3054667c7a062f6a6328163d1710de
Author: Al Stone <ahs3(a)redhat.com>
Date: Fri Aug 18 19:01:16 2017 -0600
Clean up unused patch
Signed-off-by: Al Stone <ahs3(a)redhat.com>
diff --git a/update-big-endian.patch b/update-big-endian.patch
deleted file mode 100644
index 2c859f0..0000000
--- a/update-big-endian.patch
+++ /dev/null
@@ -1,3949 +0,0 @@
-Index: acpica-unix2-20170728/source/common/acfileio.c
-===================================================================
---- acpica-unix2-20170728.orig/source/common/acfileio.c
-+++ acpica-unix2-20170728/source/common/acfileio.c
-@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
- ACPI_TABLE_HEADER *Table;
- INT32 Count;
- long TableOffset;
-+ UINT32 TableLen;
-
-
- *ReturnTable = NULL;
-@@ -319,7 +320,8 @@ AcGetOneTableFromFile (
-
- /* Allocate a buffer for the entire table */
-
-- Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
-+ ACPI_MOVE_32_TO_32(&TableLen, &TableHeader.Length);
-+ Table = AcpiOsAllocate ((ACPI_SIZE) TableLen);
- if (!Table)
- {
- return (AE_NO_MEMORY);
-@@ -329,8 +331,8 @@ AcGetOneTableFromFile (
-
- fseek (File, TableOffset, SEEK_SET);
-
-- Count = fread (Table, 1, TableHeader.Length, File);
-- if (Count != (INT32) TableHeader.Length)
-+ Count = fread (Table, 1, TableLen, File);
-+ if (Count != (INT32) TableLen)
- {
- Status = AE_ERROR;
- goto ErrorExit;
-@@ -338,7 +340,7 @@ AcGetOneTableFromFile (
-
- /* Validate the checksum (just issue a warning) */
-
-- Status = AcpiTbVerifyChecksum (Table, TableHeader.Length);
-+ Status = AcpiTbVerifyChecksum (Table, TableLen);
- if (ACPI_FAILURE (Status))
- {
- Status = AcCheckTextModeCorruption (Table);
-@@ -430,6 +432,7 @@ AcValidateTableHeader (
- ACPI_SIZE Actual;
- long OriginalOffset;
- UINT32 FileSize;
-+ UINT32 TableLength;
- UINT32 i;
-
-
-@@ -459,11 +462,12 @@ AcValidateTableHeader (
- /* Validate table length against bytes remaining in the file */
-
- FileSize = CmGetFileSize (File);
-- if (TableHeader.Length > (UINT32) (FileSize - TableOffset))
-+ ACPI_MOVE_32_TO_32(&TableLength, &TableHeader.Length);
-+ if (TableLength > (UINT32) (FileSize - TableOffset))
- {
- fprintf (stderr, "Table [%4.4s] is too long for file - "
- "needs: 0x%.2X, remaining in file: 0x%.2X\n",
-- TableHeader.Signature, TableHeader.Length,
-+ TableHeader.Signature, TableLength,
- (UINT32) (FileSize - TableOffset));
- return (AE_BAD_HEADER);
- }
-Index: acpica-unix2-20170728/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20170728.orig/source/common/dmtable.c
-+++ acpica-unix2-20170728/source/common/dmtable.c
-@@ -524,7 +524,7 @@ AcpiDmDumpDataTable (
- */
- if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
- {
-- Length = Table->Length;
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
- if (ACPI_FAILURE (Status))
- {
-@@ -538,13 +538,14 @@ AcpiDmDumpDataTable (
- else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT))
- {
- Length = AcpiDmDumpS3pt (Table);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- }
- else
- {
- /*
- * All other tables must use the common ACPI table header, dump it now
- */
-- Length = Table->Length;
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
- if (ACPI_FAILURE (Status))
- {
-@@ -755,6 +756,7 @@ AcpiDmDumpTable (
- BOOLEAN LastOutputBlankLine = FALSE;
- ACPI_STATUS Status;
- char RepairedName[8];
-+ UINT16 Val16;
-
-
- if (!Info)
-@@ -1149,8 +1151,9 @@ AcpiDmDumpTable (
- /* Checksum, display and validate */
-
- AcpiOsPrintf ("%2.2X", *Target);
-- Temp8 = AcpiDmGenerateChecksum (Table,
-- ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
-+ ACPI_MOVE_32_TO_32(&Temp32,
-+ &ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length);
-+ Temp8 = AcpiDmGenerateChecksum (Table, Temp32,
- ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
-
- if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-@@ -1215,14 +1218,14 @@ AcpiDmDumpTable (
-
- /* DMAR subtable types */
-
-- Temp16 = ACPI_GET16 (Target);
-+ Val16 = ACPI_GET16 (Target);
-+ ACPI_MOVE_16_TO_16(&Temp16, &Val16);
- if (Temp16 > ACPI_DMAR_TYPE_RESERVED)
- {
- Temp16 = ACPI_DMAR_TYPE_RESERVED;
- }
-
-- AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-- AcpiDmDmarSubnames[Temp16]);
-+ AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmDmarSubnames[Temp16]);
- break;
-
- case ACPI_DMT_DMAR_SCOPE:
-@@ -1313,14 +1316,14 @@ AcpiDmDumpTable (
-
- /* HEST subtable types */
-
-- Temp16 = ACPI_GET16 (Target);
-+ Val16 = ACPI_GET16 (Target);
-+ ACPI_MOVE_16_TO_16(&Temp16, &Val16);
- if (Temp16 > ACPI_HEST_TYPE_RESERVED)
- {
- Temp16 = ACPI_HEST_TYPE_RESERVED;
- }
-
-- AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-- AcpiDmHestSubnames[Temp16]);
-+ AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmHestSubnames[Temp16]);
- break;
-
- case ACPI_DMT_HESTNTFY:
-@@ -1400,13 +1403,14 @@ AcpiDmDumpTable (
-
- /* NFIT subtable types */
-
-- Temp16 = ACPI_GET16 (Target);
-+ Val16 = ACPI_GET16 (Target);
-+ ACPI_MOVE_16_TO_16(&Temp16, &Val16);
- if (Temp16 > ACPI_NFIT_TYPE_RESERVED)
- {
- Temp16 = ACPI_NFIT_TYPE_RESERVED;
- }
-
-- AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-+ AcpiOsPrintf (UINT16_FORMAT, Temp16,
- AcpiDmNfitSubnames[Temp16]);
- break;
-
-Index: acpica-unix2-20170728/source/common/dmtables.c
-===================================================================
---- acpica-unix2-20170728.orig/source/common/dmtables.c
-+++ acpica-unix2-20170728/source/common/dmtables.c
-@@ -142,7 +142,9 @@ AdCreateTableHeader (
- ACPI_TABLE_HEADER *Table)
- {
- UINT8 Checksum;
--
-+ UINT32 TableLen;
-+ UINT32 OemRev;
-+ UINT32 CompilerRev;
-
- /* Reset globals for External statements */
-
-@@ -154,9 +156,10 @@ AdCreateTableHeader (
- */
- AdDisassemblerHeader (Filename, ACPI_IS_AML_TABLE);
-
-+ ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
- AcpiOsPrintf (" * Original Table Header:\n");
- AcpiOsPrintf (" * Signature \"%4.4s\"\n", Table->Signature);
-- AcpiOsPrintf (" * Length 0x%8.8X (%u)\n", Table->Length, Table->Length);
-+ AcpiOsPrintf (" * Length 0x%8.8X (%u)\n", TableLen, TableLen);
-
- /* Print and validate the revision */
-
-@@ -188,7 +191,7 @@ AdCreateTableHeader (
-
- AcpiOsPrintf ("\n * Checksum 0x%2.2X", Table->Checksum);
-
-- Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
-+ Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), TableLen);
- if (Checksum)
- {
- AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
-@@ -198,9 +201,11 @@ AdCreateTableHeader (
- AcpiOsPrintf ("\n");
- AcpiOsPrintf (" * OEM ID \"%.6s\"\n", Table->OemId);
- AcpiOsPrintf (" * OEM Table ID \"%.8s\"\n", Table->OemTableId);
-- AcpiOsPrintf (" * OEM Revision 0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);
-+ ACPI_MOVE_32_TO_32(&OemRev, &Table->OemRevision);
-+ AcpiOsPrintf (" * OEM Revision 0x%8.8X (%u)\n", OemRev, OemRev);
- AcpiOsPrintf (" * Compiler ID \"%.4s\"\n", Table->AslCompilerId);
-- AcpiOsPrintf (" * Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);
-+ ACPI_MOVE_32_TO_32(&CompilerRev, &Table->AslCompilerRevision);
-+ AcpiOsPrintf (" * Compiler Version 0x%8.8X (%u)\n", CompilerRev, CompilerRev);
- AcpiOsPrintf (" */\n");
-
- /*
-@@ -221,7 +226,7 @@ AdCreateTableHeader (
- AcpiOsPrintf (
- "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
- Table->Signature, Table->Revision,
-- Table->OemId, Table->OemTableId, Table->OemRevision);
-+ Table->OemId, Table->OemTableId, OemRev);
- }
-
-
-@@ -396,7 +401,8 @@ AdParseTable (
-
- fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
-
-- AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+ ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);
-+ AmlLength -= sizeof (ACPI_TABLE_HEADER);
- AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
- ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
-
-Index: acpica-unix2-20170728/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20170728.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20170728/source/common/dmtbdump.c
-@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
- UINT32 Entries;
- UINT32 Offset;
- UINT32 i;
-+ UINT32 Length;
-+ UINT32 Address;
-
-
- /* Point to start of table pointer array */
-@@ -286,12 +288,14 @@ AcpiDmDumpRsdt (
-
- /* RSDT uses 32-bit pointers */
-
-- Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-
- for (i = 0; i < Entries; i++)
- {
- AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
-- AcpiOsPrintf ("%8.8X\n", Array[i]);
-+ ACPI_MOVE_32_TO_32(&Address, &Array[i]);
-+ AcpiOsPrintf ("%8.8X\n", Address);
- Offset += sizeof (UINT32);
- }
- }
-@@ -317,6 +321,8 @@ AcpiDmDumpXsdt (
- UINT32 Entries;
- UINT32 Offset;
- UINT32 i;
-+ UINT32 Length;
-+ UINT64 Address;
-
-
- /* Point to start of table pointer array */
-@@ -326,12 +332,14 @@ AcpiDmDumpXsdt (
-
- /* XSDT uses 64-bit pointers */
-
-- Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-
- for (i = 0; i < Entries; i++)
- {
- AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
-- AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
-+ ACPI_MOVE_64_TO_64(&Address, &Array[i]);
-+ AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Address));
- Offset += sizeof (UINT64);
- }
- }
-@@ -524,17 +532,21 @@ AcpiDmDumpAsf (
- UINT32 DataOffset = 0;
- UINT32 i;
- UINT8 Type;
-+ UINT32 Len;
-+ UINT16 SubLen;
-
-
- /* No main table, only subtables */
-
-+ ACPI_MOVE_32_TO_32(&Len, &Table->Length);
- SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Len)
- {
- /* Common subtable header */
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- SubTable->Header.Length, AcpiDmTableInfoAsfHdr);
-+ ACPI_MOVE_16_TO_16(&SubLen, &SubTable->Header.Length);
-+ Status = AcpiDmDumpTable (Len, Offset, SubTable,
-+ SubLen, AcpiDmTableInfoAsfHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -591,8 +603,7 @@ AcpiDmDumpAsf (
- return;
- }
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- SubTable->Header.Length, InfoTable);
-+ Status = AcpiDmDumpTable (Len, Offset, SubTable, SubLen, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -608,7 +619,7 @@ AcpiDmDumpAsf (
- for (i = 0; i < DataCount; i++)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, DataOffset,
-+ Status = AcpiDmDumpTable (Len, DataOffset,
- DataTable, DataLength, DataInfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -654,15 +665,14 @@ AcpiDmDumpAsf (
-
- /* Point to next subtable */
-
-- if (!SubTable->Header.Length)
-+ if (!SubLen)
- {
- AcpiOsPrintf ("Invalid zero subtable header length\n");
- return;
- }
-
-- Offset += SubTable->Header.Length;
-- SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, SubTable,
-- SubTable->Header.Length);
-+ Offset += SubLen;
-+ SubTable = ACPI_ADD_PTR (ACPI_ASF_INFO, SubTable, SubLen);
- }
- }
-
-@@ -686,12 +696,13 @@ AcpiDmDumpCpep (
- {
- ACPI_STATUS Status;
- ACPI_CPEP_POLLING *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_CPEP);
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep);
- if (ACPI_FAILURE (Status))
- {
-@@ -701,7 +712,7 @@ AcpiDmDumpCpep (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-@@ -741,7 +752,10 @@ AcpiDmDumpCsrt (
- ACPI_CSRT_GROUP *SubTable;
- ACPI_CSRT_SHARED_INFO *SharedInfoTable;
- ACPI_CSRT_DESCRIPTOR *SubSubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
-+ UINT32 SubLength;
-+ UINT32 SubSubLength;
-+ UINT32 SharedInfoLength;
- UINT32 Offset = sizeof (ACPI_TABLE_CSRT);
- UINT32 SubOffset;
- UINT32 SubSubOffset;
-@@ -752,14 +766,16 @@ AcpiDmDumpCsrt (
-
- /* Subtables (Resource Groups) */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Resource group subtable */
-
- AcpiOsPrintf ("\n");
-+ ACPI_MOVE_32_TO_32(&SubLength, &SubTable->Length);
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-- SubTable->Length, AcpiDmTableInfoCsrt0);
-+ SubLength, AcpiDmTableInfoCsrt0);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -779,19 +795,20 @@ AcpiDmDumpCsrt (
- return;
- }
-
-- SubOffset += SubTable->SharedInfoLength;
-+ ACPI_MOVE_32_TO_32(&SharedInfoLength, &SubTable->SharedInfoLength);
-+ SubOffset += SharedInfoLength;
-
- /* Sub-Subtables (Resource Descriptors) */
-
- SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
- Offset + SubOffset);
-
-- while ((SubOffset < SubTable->Length) &&
-- ((Offset + SubOffset) < Table->Length))
-+ while ((SubOffset < SubLength) && ((Offset + SubOffset) < Length))
- {
- AcpiOsPrintf ("\n");
-+ ACPI_MOVE_32_TO_32(&SubSubLength, &SubSubTable->Length);
- Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubTable,
-- SubSubTable->Length, AcpiDmTableInfoCsrt2);
-+ SubSubLength, AcpiDmTableInfoCsrt2);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -801,7 +818,7 @@ AcpiDmDumpCsrt (
-
- /* Resource-specific info buffer */
-
-- InfoLength = SubSubTable->Length - SubSubOffset;
-+ InfoLength = SubSubLength - SubSubOffset;
- if (InfoLength)
- {
- Status = AcpiDmDumpTable (Length,
-@@ -816,16 +833,15 @@ AcpiDmDumpCsrt (
-
- /* Point to next sub-subtable */
-
-- SubOffset += SubSubTable->Length;
-+ SubOffset += SubSubLength;
- SubSubTable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubTable,
-- SubSubTable->Length);
-+ SubSubLength);
- }
-
- /* Point to next subtable */
-
-- Offset += SubTable->Length;
-- SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, SubTable,
-- SubTable->Length);
-+ Offset += SubLength;
-+ SubTable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, SubTable, SubLength);
- }
- }
-
-@@ -849,16 +865,20 @@ AcpiDmDumpDbg2 (
- {
- ACPI_STATUS Status;
- ACPI_DBG2_DEVICE *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
-+ UINT16 SubLength;
- UINT32 Offset = sizeof (ACPI_TABLE_DBG2);
- UINT32 i;
- UINT32 ArrayOffset;
- UINT32 AbsoluteOffset;
- UINT8 *Array;
-+ UINT16 Tmp16;
-+ UINT16 AlsoTmp16;
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2);
- if (ACPI_FAILURE (Status))
- {
-@@ -868,11 +888,12 @@ AcpiDmDumpDbg2 (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
-+ ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-- SubTable->Length, AcpiDmTableInfoDbg2Device);
-+ SubLength, AcpiDmTableInfoDbg2Device);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -882,13 +903,13 @@ AcpiDmDumpDbg2 (
-
- for (i = 0; i < SubTable->RegisterCount; i++)
- {
-- ArrayOffset = SubTable->BaseAddressOffset +
-- (sizeof (ACPI_GENERIC_ADDRESS) * i);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->BaseAddressOffset);
-+ ArrayOffset = Tmp16 + (sizeof (ACPI_GENERIC_ADDRESS) * i);
- AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) SubTable + ArrayOffset;
-
- Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
-- SubTable->Length, AcpiDmTableInfoDbg2Addr);
-+ SubLength, AcpiDmTableInfoDbg2Addr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -899,13 +920,13 @@ AcpiDmDumpDbg2 (
-
- for (i = 0; i < SubTable->RegisterCount; i++)
- {
-- ArrayOffset = SubTable->AddressSizeOffset +
-- (sizeof (UINT32) * i);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->AddressSizeOffset);
-+ ArrayOffset = Tmp16 + (sizeof (UINT32) * i);
- AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) SubTable + ArrayOffset;
-
- Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
-- SubTable->Length, AcpiDmTableInfoDbg2Size);
-+ SubLength, AcpiDmTableInfoDbg2Size);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -915,12 +936,13 @@ AcpiDmDumpDbg2 (
- /* Dump the Namestring (required) */
-
- AcpiOsPrintf ("\n");
-- ArrayOffset = SubTable->NamepathOffset;
-+ ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->NamepathOffset);
-+ ArrayOffset = Tmp16;
- AbsoluteOffset = Offset + ArrayOffset;
- Array = (UINT8 *) SubTable + ArrayOffset;
-
- Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
-- SubTable->Length, AcpiDmTableInfoDbg2Name);
-+ SubLength, AcpiDmTableInfoDbg2Name);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -930,9 +952,10 @@ AcpiDmDumpDbg2 (
-
- if (SubTable->OemDataOffset)
- {
-- Status = AcpiDmDumpTable (Length, Offset + SubTable->OemDataOffset,
-- Table, SubTable->OemDataLength,
-- AcpiDmTableInfoDbg2OemData);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &SubTable->OemDataOffset);
-+ ACPI_MOVE_16_TO_16(&AlsoTmp16, &SubTable->OemDataLength);
-+ Status = AcpiDmDumpTable (Length, Offset + Tmp16,
-+ Table, AlsoTmp16, AcpiDmTableInfoDbg2OemData);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -941,9 +964,9 @@ AcpiDmDumpDbg2 (
-
- /* Point to next subtable */
-
-- Offset += SubTable->Length;
-+ Offset += SubLength;
- SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, SubTable,
-- SubTable->Length);
-+ SubLength);
- }
- }
-
-@@ -967,17 +990,20 @@ AcpiDmDumpDmar (
- {
- ACPI_STATUS Status;
- ACPI_DMAR_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
-+ UINT16 SubLength;
- UINT32 Offset = sizeof (ACPI_TABLE_DMAR);
- ACPI_DMTABLE_INFO *InfoTable;
- ACPI_DMAR_DEVICE_SCOPE *ScopeTable;
- UINT32 ScopeOffset;
- UINT8 *PciPath;
- UINT32 PathOffset;
-+ UINT16 SubType;
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar);
- if (ACPI_FAILURE (Status))
- {
-@@ -987,13 +1013,14 @@ AcpiDmDumpDmar (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-+ ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-- SubTable->Length, AcpiDmTableInfoDmarHdr);
-+ SubLength, AcpiDmTableInfoDmarHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1001,7 +1028,8 @@ AcpiDmDumpDmar (
-
- AcpiOsPrintf ("\n");
-
-- switch (SubTable->Type)
-+ ACPI_MOVE_16_TO_16(&SubType, &SubTable->Type);
-+ switch (SubType)
- {
- case ACPI_DMAR_TYPE_HARDWARE_UNIT:
-
-@@ -1036,12 +1064,12 @@ AcpiDmDumpDmar (
- default:
-
- AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
-- SubTable->Type);
-+ SubType);
- return;
- }
-
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-- SubTable->Length, InfoTable);
-+ SubLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1050,8 +1078,8 @@ AcpiDmDumpDmar (
- /*
- * Dump the optional device scope entries
- */
-- if ((SubTable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-- (SubTable->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+ if ((SubType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+ (SubType == ACPI_DMAR_TYPE_NAMESPACE))
- {
- /* These types do not support device scopes */
-
-@@ -1059,7 +1087,7 @@ AcpiDmDumpDmar (
- }
-
- ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, SubTable, ScopeOffset);
-- while (ScopeOffset < SubTable->Length)
-+ while (ScopeOffset < SubLength)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -1100,9 +1128,8 @@ AcpiDmDumpDmar (
- NextSubtable:
- /* Point to next subtable */
-
-- Offset += SubTable->Length;
-- SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, SubTable,
-- SubTable->Length);
-+ Offset += SubLength;
-+ SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, SubTable, SubLength);
- }
- }
-
-@@ -1129,12 +1156,15 @@ AcpiDmDumpDrtm (
- ACPI_DRTM_RESOURCE_LIST *DrtmRl;
- ACPI_DRTM_DPS_ID *DrtmDps;
- UINT32 Count;
-+ UINT32 ValidatedCount;
-+ UINT32 ResourceCount;
-+ UINT32 Length;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-- AcpiDmTableInfoDrtm);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDrtm);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1148,7 +1178,7 @@ AcpiDmDumpDrtm (
-
- DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (Length, Offset,
- DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
- AcpiDmTableInfoDrtm0);
- if (ACPI_FAILURE (Status))
-@@ -1161,10 +1191,11 @@ AcpiDmDumpDrtm (
- /* Dump Validated table addresses */
-
- Count = 0;
-- while ((Offset < Table->Length) &&
-- (DrtmVtl->ValidatedTableCount > Count))
-+ ACPI_MOVE_32_TO_32(&ValidatedCount, &DrtmVtl->ValidatedTableCount);
-+ while ((Offset < Length) &&
-+ (ValidatedCount > Count))
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (Length, Offset,
- ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
- AcpiDmTableInfoDrtm0a);
- if (ACPI_FAILURE (Status))
-@@ -1180,7 +1211,7 @@ AcpiDmDumpDrtm (
-
- DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (Length, Offset,
- DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
- AcpiDmTableInfoDrtm1);
- if (ACPI_FAILURE (Status))
-@@ -1193,10 +1224,11 @@ AcpiDmDumpDrtm (
- /* Dump the Resource List */
-
- Count = 0;
-- while ((Offset < Table->Length) &&
-- (DrtmRl->ResourceCount > Count))
-+ ACPI_MOVE_32_TO_32(&ResourceCount, &DrtmRl->ResourceCount);
-+ while ((Offset < Length) &&
-+ (ResourceCount > Count))
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset,
-+ Status = AcpiDmDumpTable (Length, Offset,
- ACPI_ADD_PTR (void, Table, Offset),
- sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
- if (ACPI_FAILURE (Status))
-@@ -1212,7 +1244,7 @@ AcpiDmDumpDrtm (
-
- DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
- AcpiOsPrintf ("\n");
-- (void) AcpiDmDumpTable (Table->Length, Offset,
-+ (void) AcpiDmDumpTable (Length, Offset,
- DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
- }
-
-@@ -1236,12 +1268,13 @@ AcpiDmDumpEinj (
- {
- ACPI_STATUS Status;
- ACPI_WHEA_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_EINJ);
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj);
- if (ACPI_FAILURE (Status))
- {
-@@ -1251,7 +1284,7 @@ AcpiDmDumpEinj (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-@@ -1289,12 +1322,13 @@ AcpiDmDumpErst (
- {
- ACPI_STATUS Status;
- ACPI_WHEA_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_ERST);
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst);
- if (ACPI_FAILURE (Status))
- {
-@@ -1304,7 +1338,7 @@ AcpiDmDumpErst (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-@@ -1342,17 +1376,19 @@ AcpiDmDumpFpdt (
- {
- ACPI_STATUS Status;
- ACPI_FPDT_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
- ACPI_DMTABLE_INFO *InfoTable;
-+ UINT16 Type;
-
-
- /* There is no main table (other than the standard ACPI header) */
-
- /* Subtables */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
-@@ -1364,7 +1400,8 @@ AcpiDmDumpFpdt (
- return;
- }
-
-- switch (SubTable->Type)
-+ ACPI_MOVE_16_TO_16(&Type, &SubTable->Type);
-+ switch (Type)
- {
- case ACPI_FPDT_TYPE_BOOT:
-
-@@ -1378,8 +1415,7 @@ AcpiDmDumpFpdt (
-
- default:
-
-- AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n",
-- SubTable->Type);
-+ AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n", Type);
-
- /* Attempt to continue */
-
-@@ -1427,16 +1463,19 @@ AcpiDmDumpGtdt (
- {
- ACPI_STATUS Status;
- ACPI_GTDT_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
-+ UINT16 SubLength;
- UINT32 Offset = sizeof (ACPI_TABLE_GTDT);
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubTableLength;
- UINT32 GtCount;
-+ UINT32 Tmp32;
- ACPI_GTDT_TIMER_ENTRY *GtxTable;
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt);
- if (ACPI_FAILURE (Status))
- {
-@@ -1446,7 +1485,7 @@ AcpiDmDumpGtdt (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
-@@ -1464,8 +1503,9 @@ AcpiDmDumpGtdt (
- case ACPI_GTDT_TYPE_TIMER_BLOCK:
-
- SubTableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
-- GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+ Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
- SubTable))->TimerCount;
-+ ACPI_MOVE_32_TO_32(&GtCount, &Tmp32);
-
- InfoTable = AcpiDmTableInfoGtdt0;
- break;
-@@ -1486,8 +1526,9 @@ AcpiDmDumpGtdt (
- return;
- }
-
-+ ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-- SubTable->Length, InfoTable);
-+ SubLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1546,16 +1587,18 @@ AcpiDmDumpHest (
- {
- ACPI_STATUS Status;
- ACPI_HEST_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_HEST);
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubTableLength;
- UINT32 BankCount;
- ACPI_HEST_IA_ERROR_BANK *BankTable;
-+ UINT16 SubType;
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHest);
- if (ACPI_FAILURE (Status))
- {
-@@ -1565,10 +1608,11 @@ AcpiDmDumpHest (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- BankCount = 0;
-- switch (SubTable->Type)
-+ ACPI_MOVE_16_TO_16(&SubType, &SubTable->Type);
-+ switch (SubType)
- {
- case ACPI_HEST_TYPE_IA32_CHECK:
-
-@@ -1902,15 +1946,21 @@ AcpiDmDumpIort (
- ACPI_IORT_SMMU *IortSmmu = NULL;
- UINT32 Offset;
- UINT32 NodeOffset;
-+ UINT16 NodeLength;
- UINT32 Length;
- ACPI_DMTABLE_INFO *InfoTable;
- char *String;
- UINT32 i;
--
-+ UINT32 TableLen;
-+ UINT32 ItsCount;
-+ UINT32 MappingCount;
-+ UINT32 CtxIntCount;
-+ UINT32 PmuIntCount;
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
-+ ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
-+ Status = AcpiDmDumpTable (TableLen, 0, Table, 0, AcpiDmTableInfoIort);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -1921,18 +1971,19 @@ AcpiDmDumpIort (
-
- /* Dump the OptionalPadding (optional) */
-
-- if (Iort->NodeOffset > Offset)
-+ ACPI_MOVE_32_TO_32(&NodeOffset, &Iort->NodeOffset);
-+ if (NodeOffset > Offset)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset, Table,
-- Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
-+ Status = AcpiDmDumpTable (TableLen, Offset, Table,
-+ NodeOffset - Offset, AcpiDmTableInfoIortPad);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
- }
-
-- Offset = Iort->NodeOffset;
-- while (Offset < Table->Length)
-+ ACPI_MOVE_32_TO_32(&Offset, &Iort->NodeOffset);
-+ while (Offset < TableLen)
- {
- /* Common subtable header */
-
-@@ -1968,7 +2019,8 @@ AcpiDmDumpIort (
- case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
-
- InfoTable = AcpiDmTableInfoIort2;
-- Length = IortNode->Length - NodeOffset;
-+ ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+ Length = NodeLength - NodeOffset;
- break;
-
- case ACPI_IORT_NODE_SMMU:
-@@ -1981,7 +2033,8 @@ AcpiDmDumpIort (
- case ACPI_IORT_NODE_SMMU_V3:
-
- InfoTable = AcpiDmTableInfoIort4;
-- Length = IortNode->Length - NodeOffset;
-+ ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+ Length = NodeLength - NodeOffset;
- break;
-
- default:
-@@ -1991,7 +2044,8 @@ AcpiDmDumpIort (
-
- /* Attempt to continue */
-
-- if (!IortNode->Length)
-+ ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+ if (!NodeLength)
- {
- AcpiOsPrintf ("Invalid zero length IORT node\n");
- return;
-@@ -2002,7 +2056,7 @@ AcpiDmDumpIort (
- /* Dump the node subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- Length, InfoTable);
- if (ACPI_FAILURE (Status))
-@@ -2022,9 +2076,10 @@ AcpiDmDumpIort (
-
- if (IortItsGroup)
- {
-- for (i = 0; i < IortItsGroup->ItsCount; i++)
-+ ACPI_MOVE_32_TO_32(&ItsCount, &IortItsGroup->ItsCount);
-+ for (i = 0; i < ItsCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- 4, AcpiDmTableInfoIort0a);
- NodeOffset += 4;
-@@ -2036,11 +2091,11 @@ AcpiDmDumpIort (
-
- /* Dump the Padding (optional) */
-
-- if (IortNode->Length > NodeOffset)
-+ ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+ if (NodeLength > NodeOffset)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-- Table, IortNode->Length - NodeOffset,
-- AcpiDmTableInfoIort1a);
-+ Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-+ Table, NodeLength - NodeOffset, AcpiDmTableInfoIort1a);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2057,8 +2112,8 @@ AcpiDmDumpIort (
- if (IortSmmu)
- {
- Length = 2 * sizeof (UINT64);
-- NodeOffset = IortSmmu->GlobalInterruptOffset;
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->GlobalInterruptOffset);
-+ Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- Length, AcpiDmTableInfoIort3a);
- if (ACPI_FAILURE (Status))
-@@ -2066,10 +2121,11 @@ AcpiDmDumpIort (
- return;
- }
-
-- NodeOffset = IortSmmu->ContextInterruptOffset;
-- for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
-+ ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->ContextInterruptOffset);
-+ ACPI_MOVE_32_TO_32(&CtxIntCount, &IortSmmu->ContextInterruptCount);
-+ for (i = 0; i < CtxIntCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- 8, AcpiDmTableInfoIort3b);
- if (ACPI_FAILURE (Status))
-@@ -2080,10 +2136,11 @@ AcpiDmDumpIort (
- NodeOffset += 8;
- }
-
-- NodeOffset = IortSmmu->PmuInterruptOffset;
-- for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
-+ ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->PmuInterruptOffset);
-+ ACPI_MOVE_32_TO_32(&PmuIntCount, &IortSmmu->PmuInterruptCount);
-+ for (i = 0; i < PmuIntCount; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- 8, AcpiDmTableInfoIort3c);
- if (ACPI_FAILURE (Status))
-@@ -2103,12 +2160,13 @@ AcpiDmDumpIort (
-
- /* Dump the ID mappings */
-
-- NodeOffset = IortNode->MappingOffset;
-- for (i = 0; i < IortNode->MappingCount; i++)
-+ ACPI_MOVE_32_TO_32(&NodeOffset, &IortNode->MappingOffset);
-+ ACPI_MOVE_32_TO_32(&MappingCount, &IortNode->MappingCount);
-+ for (i = 0; i < MappingCount; i++)
- {
- AcpiOsPrintf ("\n");
- Length = sizeof (ACPI_IORT_ID_MAPPING);
-- Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+ Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
- ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
- Length, AcpiDmTableInfoIortMap);
- if (ACPI_FAILURE (Status))
-@@ -2122,8 +2180,9 @@ AcpiDmDumpIort (
- NextSubTable:
- /* Point to next node subtable */
-
-- Offset += IortNode->Length;
-- IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, IortNode->Length);
-+ ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+ Offset += NodeLength;
-+ IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeLength);
- }
- }
-
-@@ -2154,11 +2213,14 @@ AcpiDmDumpIvrs (
- ACPI_IVRS_DE_HEADER *DeviceEntry;
- ACPI_IVRS_HEADER *SubTable;
- ACPI_DMTABLE_INFO *InfoTable;
-+ UINT32 Length;
-+ UINT16 SubLength;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoIvrs);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2167,13 +2229,14 @@ AcpiDmDumpIvrs (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- SubTable->Length, AcpiDmTableInfoIvrsHdr);
-+ ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
-+ SubLength, AcpiDmTableInfoIvrsHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2200,7 +2263,7 @@ AcpiDmDumpIvrs (
-
- /* Attempt to continue */
-
-- if (!SubTable->Length)
-+ if (!SubLength)
- {
- AcpiOsPrintf ("Invalid zero length subtable\n");
- return;
-@@ -2211,8 +2274,8 @@ AcpiDmDumpIvrs (
- /* Dump the subtable */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- SubTable->Length, InfoTable);
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
-+ SubLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2226,7 +2289,7 @@ AcpiDmDumpIvrs (
- DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, SubTable,
- sizeof (ACPI_IVRS_HARDWARE));
-
-- while (EntryOffset < (Offset + SubTable->Length))
-+ while (EntryOffset < (Offset + SubLength))
- {
- AcpiOsPrintf ("\n");
- /*
-@@ -2288,7 +2351,7 @@ AcpiDmDumpIvrs (
-
- /* Dump the Device Entry */
-
-- Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+ Status = AcpiDmDumpTable (Length, EntryOffset,
- DeviceEntry, EntryLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -2304,8 +2367,8 @@ AcpiDmDumpIvrs (
- NextSubTable:
- /* Point to next subtable */
-
-- Offset += SubTable->Length;
-- SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, SubTable, SubTable->Length);
-+ Offset += SubLength;
-+ SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, SubTable, SubLength);
- }
- }
-
-@@ -2331,7 +2394,7 @@ AcpiDmDumpLpit (
- {
- ACPI_STATUS Status;
- ACPI_LPIT_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_LPIT);
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 SubTableLength;
-@@ -2339,8 +2402,9 @@ AcpiDmDumpLpit (
-
- /* Subtables */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- SubTable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
-@@ -2404,13 +2468,14 @@ AcpiDmDumpMadt (
- {
- ACPI_STATUS Status;
- ACPI_SUBTABLE_HEADER *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_MADT);
- ACPI_DMTABLE_INFO *InfoTable;
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
- if (ACPI_FAILURE (Status))
- {
-@@ -2420,7 +2485,7 @@ AcpiDmDumpMadt (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
-@@ -2566,11 +2631,13 @@ AcpiDmDumpMcfg (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_MCFG);
- ACPI_MCFG_ALLOCATION *SubTable;
-+ UINT32 Len;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
-+ ACPI_MOVE_32_TO_32(&Len, &Table->Length);
-+ Status = AcpiDmDumpTable (Len, 0, Table, 0, AcpiDmTableInfoMcfg);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2579,17 +2646,17 @@ AcpiDmDumpMcfg (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Len)
- {
-- if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
-+ if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Len)
- {
- AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
-- sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
-+ sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
- return;
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Len, Offset, SubTable,
- sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
- if (ACPI_FAILURE (Status))
- {
-@@ -2623,6 +2690,7 @@ AcpiDmDumpMpst (
- {
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_MPST);
-+ ACPI_TABLE_MPST *Mpst;
- ACPI_MPST_POWER_NODE *SubTable0;
- ACPI_MPST_POWER_STATE *SubTable0A;
- ACPI_MPST_COMPONENT *SubTable0B;
-@@ -2631,11 +2699,13 @@ AcpiDmDumpMpst (
- UINT16 SubtableCount;
- UINT32 PowerStateCount;
- UINT32 ComponentCount;
-+ UINT32 Length;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMpst);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2643,13 +2713,14 @@ AcpiDmDumpMpst (
-
- /* Subtable: Memory Power Node(s) */
-
-- SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+ Mpst = ACPI_CAST_PTR (ACPI_TABLE_MPST, Table);
-+ ACPI_MOVE_16_TO_16(&SubtableCount, &Mpst->PowerNodeCount);
- SubTable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
-
-- while ((Offset < Table->Length) && SubtableCount)
-+ while ((Offset < Length) && SubtableCount)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable0,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable0,
- sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
- if (ACPI_FAILURE (Status))
- {
-@@ -2658,8 +2729,8 @@ AcpiDmDumpMpst (
-
- /* Extract the sub-subtable counts */
-
-- PowerStateCount = SubTable0->NumPowerStates;
-- ComponentCount = SubTable0->NumPhysicalComponents;
-+ ACPI_MOVE_32_TO_32(&PowerStateCount, &SubTable0->NumPowerStates);
-+ ACPI_MOVE_32_TO_32(&ComponentCount, &SubTable0->NumPhysicalComponents);
- Offset += sizeof (ACPI_MPST_POWER_NODE);
-
- /* Sub-subtables - Memory Power State Structure(s) */
-@@ -2670,7 +2741,7 @@ AcpiDmDumpMpst (
- while (PowerStateCount)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable0A,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable0A,
- sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
- if (ACPI_FAILURE (Status))
- {
-@@ -2680,7 +2751,7 @@ AcpiDmDumpMpst (
- SubTable0A++;
- PowerStateCount--;
- Offset += sizeof (ACPI_MPST_POWER_STATE);
-- }
-+ }
-
- /* Sub-subtables - Physical Component ID Structure(s) */
-
-@@ -2693,7 +2764,7 @@ AcpiDmDumpMpst (
-
- while (ComponentCount)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable0B,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable0B,
- sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
- if (ACPI_FAILURE (Status))
- {
-@@ -2708,17 +2779,19 @@ AcpiDmDumpMpst (
- /* Point to next Memory Power Node subtable */
-
- SubtableCount--;
-+ ACPI_MOVE_32_TO_32(&PowerStateCount, &SubTable0->NumPowerStates);
-+ ACPI_MOVE_32_TO_32(&ComponentCount, &SubTable0->NumPhysicalComponents);
- SubTable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, SubTable0,
- sizeof (ACPI_MPST_POWER_NODE) +
-- (sizeof (ACPI_MPST_POWER_STATE) * SubTable0->NumPowerStates) +
-- (sizeof (ACPI_MPST_COMPONENT) * SubTable0->NumPhysicalComponents));
-+ (sizeof (ACPI_MPST_POWER_STATE) * PowerStateCount) +
-+ (sizeof (ACPI_MPST_COMPONENT) * ComponentCount));
- }
-
- /* Subtable: Count of Memory Power State Characteristic structures */
-
- AcpiOsPrintf ("\n");
- SubTable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, SubTable0);
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable1,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable1,
- sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
- if (ACPI_FAILURE (Status))
- {
-@@ -2733,10 +2806,10 @@ AcpiDmDumpMpst (
- SubTable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, SubTable1,
- sizeof (ACPI_MPST_DATA_HDR));
-
-- while ((Offset < Table->Length) && SubtableCount)
-+ while ((Offset < Length) && SubtableCount)
- {
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable2,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable2,
- sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
- if (ACPI_FAILURE (Status))
- {
-@@ -2769,11 +2842,13 @@ AcpiDmDumpMsct (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_MSCT);
- ACPI_MSCT_PROXIMITY *SubTable;
-+ UINT32 Length;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMsct);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2782,12 +2857,12 @@ AcpiDmDumpMsct (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
- if (ACPI_FAILURE (Status))
- {
-@@ -2822,11 +2897,13 @@ AcpiDmDumpMtmr (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_MTMR);
- ACPI_MTMR_ENTRY *SubTable;
-+ UINT32 Length;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMtmr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2835,12 +2912,12 @@ AcpiDmDumpMtmr (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
- if (ACPI_FAILURE (Status))
- {
-@@ -2882,11 +2959,17 @@ AcpiDmDumpNfit (
- ACPI_NFIT_SMBIOS *SmbiosInfo = NULL;
- ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
- UINT32 i;
-+ UINT32 TableLength;
-+ UINT16 SubLength;
-+ UINT16 SubType;
-+ UINT32 Count;
-+ UINT16 Count16;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
-+ ACPI_MOVE_32_TO_32(&TableLength, &Table->Length);
-+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2895,19 +2978,21 @@ AcpiDmDumpNfit (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < TableLength)
- {
- /* NFIT subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- SubTable->Length, AcpiDmTableInfoNfitHdr);
-+ ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);
-+ Status = AcpiDmDumpTable (TableLength, Offset, SubTable,
-+ SubLength, AcpiDmTableInfoNfitHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
-- switch (SubTable->Type)
-+ ACPI_MOVE_16_TO_16(&SubType, &SubTable->Type);
-+ switch (SubType)
- {
- case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
-
-@@ -2959,7 +3044,7 @@ AcpiDmDumpNfit (
-
- /* Attempt to continue */
-
-- if (!SubTable->Length)
-+ if (!SubLength)
- {
- AcpiOsPrintf ("Invalid zero length subtable\n");
- return;
-@@ -2968,8 +3053,8 @@ AcpiDmDumpNfit (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- SubTable->Length, InfoTable);
-+ Status = AcpiDmDumpTable (TableLength, Offset, SubTable,
-+ SubLength, InfoTable);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -2977,13 +3062,14 @@ AcpiDmDumpNfit (
-
- /* Per-subtable variable-length fields */
-
-- switch (SubTable->Type)
-+ switch (SubType)
- {
- case ACPI_NFIT_TYPE_INTERLEAVE:
-
-- for (i = 0; i < Interleave->LineCount; i++)
-+ ACPI_MOVE_32_TO_32(&Count, &Interleave->LineCount);
-+ for (i = 0; i < Count; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
- &Interleave->LineOffset[i],
- sizeof (UINT32), AcpiDmTableInfoNfit2a);
- if (ACPI_FAILURE (Status))
-@@ -2997,12 +3083,11 @@ AcpiDmDumpNfit (
-
- case ACPI_NFIT_TYPE_SMBIOS:
-
-- Length = SubTable->Length -
-- sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
-+ Length = SubLength - sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
-
- if (Length)
- {
-- Status = AcpiDmDumpTable (Table->Length,
-+ Status = AcpiDmDumpTable (TableLength,
- sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
- SmbiosInfo,
- Length, AcpiDmTableInfoNfit3a);
-@@ -3016,9 +3101,10 @@ AcpiDmDumpNfit (
-
- case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
-
-- for (i = 0; i < Hint->HintCount; i++)
-+ ACPI_MOVE_16_TO_16(&Count16, &Hint->HintCount);
-+ for (i = 0; i < Count16; i++)
- {
-- Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+ Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
- &Hint->HintAddress[i],
- sizeof (UINT64), AcpiDmTableInfoNfit6a);
- if (ACPI_FAILURE (Status))
-@@ -3037,8 +3123,8 @@ AcpiDmDumpNfit (
- NextSubTable:
- /* Point to next subtable */
-
-- Offset += SubTable->Length;
-- SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, SubTable, SubTable->Length);
-+ Offset += SubLength;
-+ SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, SubTable, SubLength);
- }
- }
-
-@@ -3063,12 +3149,13 @@ AcpiDmDumpPcct (
- ACPI_STATUS Status;
- ACPI_PCCT_SUBSPACE *SubTable;
- ACPI_DMTABLE_INFO *InfoTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_PCCT);
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
- if (ACPI_FAILURE (Status))
- {
-@@ -3078,7 +3165,7 @@ AcpiDmDumpPcct (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
-@@ -3164,16 +3251,21 @@ AcpiDmDumpPmtt (
- ACPI_PMTT_HEADER *MemSubTable;
- ACPI_PMTT_HEADER *DimmSubTable;
- ACPI_PMTT_DOMAIN *DomainArray;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 Offset = sizeof (ACPI_TABLE_PMTT);
- UINT32 MemOffset;
- UINT32 DimmOffset;
- UINT32 DomainOffset;
-- UINT32 DomainCount;
-+ UINT16 DomainCount;
-+ UINT16 SubLength;
-+ UINT16 Tmp16;
-+ UINT16 MemLength;
-+ UINT16 DimmLength;
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
- if (ACPI_FAILURE (Status))
- {
-@@ -3183,13 +3275,14 @@ AcpiDmDumpPmtt (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-+ ACPI_MOVE_16_TO_16(&SubLength, &SubTable->Length);
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-- SubTable->Length, AcpiDmTableInfoPmttHdr);
-+ SubLength, AcpiDmTableInfoPmttHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3208,7 +3301,7 @@ AcpiDmDumpPmtt (
- /* Dump the fixed-length portion of the subtable */
-
- Status = AcpiDmDumpTable (Length, Offset, SubTable,
-- SubTable->Length, AcpiDmTableInfoPmtt0);
-+ SubLength, AcpiDmTableInfoPmtt0);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3220,15 +3313,16 @@ AcpiDmDumpPmtt (
- MemSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, SubTable,
- sizeof (ACPI_PMTT_SOCKET));
-
-- while (((Offset + MemOffset) < Table->Length) &&
-- (MemOffset < SubTable->Length))
-+ while (((Offset + MemOffset) < Length) &&
-+ (MemOffset < SubLength))
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-+ ACPI_MOVE_16_TO_16(&MemLength, &MemSubTable->Length);
- Status = AcpiDmDumpTable (Length,
- Offset + MemOffset, MemSubTable,
-- MemSubTable->Length, AcpiDmTableInfoPmttHdr);
-+ MemLength, AcpiDmTableInfoPmttHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3248,7 +3342,7 @@ AcpiDmDumpPmtt (
-
- Status = AcpiDmDumpTable (Length,
- Offset + MemOffset, MemSubTable,
-- MemSubTable->Length, AcpiDmTableInfoPmtt1);
-+ MemLength, AcpiDmTableInfoPmtt1);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3256,13 +3350,14 @@ AcpiDmDumpPmtt (
-
- /* Walk the variable count of proximity domains */
-
-- DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubTable)->DomainCount;
-+ Tmp16 = ((ACPI_PMTT_CONTROLLER *) MemSubTable)->DomainCount;
-+ ACPI_MOVE_16_TO_16(&DomainCount, &Tmp16);
- DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
- DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubTable,
- sizeof (ACPI_PMTT_CONTROLLER));
-
-- while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
-- ((MemOffset + DomainOffset) < SubTable->Length) &&
-+ while (((Offset + MemOffset + DomainOffset) < Length) &&
-+ ((MemOffset + DomainOffset) < SubLength) &&
- DomainCount)
- {
- Status = AcpiDmDumpTable (Length,
-@@ -3290,15 +3385,16 @@ AcpiDmDumpPmtt (
- DimmSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubTable,
- DomainOffset);
-
-- while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
-- (DimmOffset < MemSubTable->Length))
-+ while (((Offset + MemOffset + DimmOffset) < Length) &&
-+ (DimmOffset < MemLength))
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-+ ACPI_MOVE_16_TO_16(&DimmLength, &DimmSubTable->Length);
- Status = AcpiDmDumpTable (Length,
- Offset + MemOffset + DimmOffset, DimmSubTable,
-- DimmSubTable->Length, AcpiDmTableInfoPmttHdr);
-+ DimmLength, AcpiDmTableInfoPmttHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3318,7 +3414,7 @@ AcpiDmDumpPmtt (
-
- Status = AcpiDmDumpTable (Length,
- Offset + MemOffset + DimmOffset, DimmSubTable,
-- DimmSubTable->Length, AcpiDmTableInfoPmtt2);
-+ DimmLength, AcpiDmTableInfoPmtt2);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3326,23 +3422,22 @@ AcpiDmDumpPmtt (
-
- /* Point to next DIMM subtable */
-
-- DimmOffset += DimmSubTable->Length;
-+ DimmOffset += DimmLength;
- DimmSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
-- DimmSubTable, DimmSubTable->Length);
-+ DimmSubTable, DimmLength);
- }
-
- /* Point to next Controller subtable */
-
-- MemOffset += MemSubTable->Length;
-+ MemOffset += MemLength;
- MemSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
-- MemSubTable, MemSubTable->Length);
-+ MemSubTable, MemLength);
- }
-
- /* Point to next Socket subtable */
-
-- Offset += SubTable->Length;
-- SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
-- SubTable, SubTable->Length);
-+ Offset += SubLength;
-+ SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, SubTable, SubLength);
- }
- }
-
-@@ -3498,6 +3593,8 @@ AcpiDmDumpS3pt (
- ACPI_FPDT_HEADER *SubTable;
- ACPI_DMTABLE_INFO *InfoTable;
- ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
-+ UINT32 Length;
-+ UINT16 SubType;
-
-
- /* Main table */
-@@ -3508,20 +3605,22 @@ AcpiDmDumpS3pt (
- return 0;
- }
-
-+ ACPI_MOVE_32_TO_32(&Length, &S3ptTable->Length);
- SubTable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
-- while (Offset < S3ptTable->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (S3ptTable->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoS3ptHdr);
- if (ACPI_FAILURE (Status))
- {
- return 0;
- }
-
-- switch (SubTable->Type)
-+ ACPI_MOVE_16_TO_16(&SubType, &SubTable->Type);
-+ switch (SubType)
- {
- case ACPI_S3PT_TYPE_RESUME:
-
-@@ -3536,7 +3635,7 @@ AcpiDmDumpS3pt (
- default:
-
- AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
-- SubTable->Type);
-+ SubType);
-
- /* Attempt to continue */
-
-@@ -3549,7 +3648,7 @@ AcpiDmDumpS3pt (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (S3ptTable->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -3583,9 +3682,11 @@ void
- AcpiDmDumpSlic (
- ACPI_TABLE_HEADER *Table)
- {
-+ UINT32 Length;
-
-- (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
-- Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ (void) AcpiDmDumpTable (Length, sizeof (ACPI_TABLE_HEADER), Table,
-+ Length - sizeof (*Table), AcpiDmTableInfoSlic);
- }
-
-
-@@ -3608,14 +3709,17 @@ AcpiDmDumpSlit (
- ACPI_STATUS Status;
- UINT32 Offset;
- UINT8 *Row;
-- UINT32 Localities;
-+ UINT64 Localities;
- UINT32 i;
- UINT32 j;
-+ UINT32 Length;
-+ UINT64 Tmp64;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSlit);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3623,7 +3727,8 @@ AcpiDmDumpSlit (
-
- /* Display the Locality NxN Matrix */
-
-- Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+ Tmp64 = (UINT64) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+ ACPI_MOVE_64_TO_64(&Localities, &Tmp64);
- Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
- Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
-
-@@ -3636,7 +3741,7 @@ AcpiDmDumpSlit (
- {
- /* Check for beyond EOT */
-
-- if (Offset >= Table->Length)
-+ if (Offset >= Length)
- {
- AcpiOsPrintf (
- "\n**** Not enough room in table for all localities\n");
-@@ -3688,11 +3793,13 @@ AcpiDmDumpSrat (
- UINT32 Offset = sizeof (ACPI_TABLE_SRAT);
- ACPI_SUBTABLE_HEADER *SubTable;
- ACPI_DMTABLE_INFO *InfoTable;
-+ UINT32 Length;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSrat);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3701,12 +3808,12 @@ AcpiDmDumpSrat (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, AcpiDmTableInfoSratHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -3755,7 +3862,7 @@ AcpiDmDumpSrat (
- }
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- SubTable->Length, InfoTable);
- if (ACPI_FAILURE (Status))
- {
-@@ -3792,13 +3899,14 @@ AcpiDmDumpStao (
- {
- ACPI_STATUS Status;
- char *Namepath;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT32 StringLength;
- UINT32 Offset = sizeof (ACPI_TABLE_STAO);
-
-
- /* Main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
- if (ACPI_FAILURE (Status))
- {
-@@ -3807,7 +3915,7 @@ AcpiDmDumpStao (
-
- /* The rest of the table consists of Namepath strings */
-
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- Namepath = ACPI_ADD_PTR (char, Table, Offset);
- StringLength = strlen (Namepath) + 1;
-@@ -3849,11 +3957,14 @@ AcpiDmDumpTcpa (
- ACPI_TABLE_TCPA_HDR *SubTable = ACPI_ADD_PTR (
- ACPI_TABLE_TCPA_HDR, Table, Offset);
- ACPI_STATUS Status;
-+ UINT32 Length;
-+ UINT16 PlatformClass;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table,
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table,
- 0, AcpiDmTableInfoTcpaHdr);
- if (ACPI_FAILURE (Status))
- {
-@@ -3864,18 +3975,19 @@ AcpiDmDumpTcpa (
- * Examine the PlatformClass field to determine the table type.
- * Either a client or server table. Only one.
- */
-- switch (CommonHeader->PlatformClass)
-+ ACPI_MOVE_16_TO_16(&PlatformClass, &CommonHeader->PlatformClass);
-+ switch (PlatformClass)
- {
- case ACPI_TCPA_CLIENT_TABLE:
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- Table->Length - Offset, AcpiDmTableInfoTcpaClient);
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
-+ Length - Offset, AcpiDmTableInfoTcpaClient);
- break;
-
- case ACPI_TCPA_SERVER_TABLE:
-
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-- Table->Length - Offset, AcpiDmTableInfoTcpaServer);
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
-+ Length - Offset, AcpiDmTableInfoTcpaServer);
- break;
-
- default:
-@@ -3912,11 +4024,13 @@ AcpiDmDumpVrtc (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
- ACPI_VRTC_ENTRY *SubTable;
-+ UINT32 Length;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoVrtc);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3925,12 +4039,12 @@ AcpiDmDumpVrtc (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
- if (ACPI_FAILURE (Status))
- {
-@@ -3965,11 +4079,13 @@ AcpiDmDumpWdat (
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_WDAT);
- ACPI_WDAT_ENTRY *SubTable;
-+ UINT32 Length;
-
-
- /* Main table */
-
-- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWdat);
- if (ACPI_FAILURE (Status))
- {
- return;
-@@ -3978,12 +4094,12 @@ AcpiDmDumpWdat (
- /* Subtables */
-
- SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
-- while (Offset < Table->Length)
-+ while (Offset < Length)
- {
- /* Common subtable header */
-
- AcpiOsPrintf ("\n");
-- Status = AcpiDmDumpTable (Table->Length, Offset, SubTable,
-+ Status = AcpiDmDumpTable (Length, Offset, SubTable,
- sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
- if (ACPI_FAILURE (Status))
- {
-@@ -4018,12 +4134,13 @@ AcpiDmDumpWpbt (
- {
- ACPI_STATUS Status;
- ACPI_TABLE_WPBT *SubTable;
-- UINT32 Length = Table->Length;
-+ UINT32 Length;
- UINT16 ArgumentsLength;
-
-
- /* Dump the main table */
-
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
- if (ACPI_FAILURE (Status))
- {
-@@ -4033,10 +4150,10 @@ AcpiDmDumpWpbt (
- /* Extract the arguments buffer length from the main table */
-
- SubTable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
-- ArgumentsLength = SubTable->ArgumentsLength;
-+ ACPI_MOVE_16_TO_16(&ArgumentsLength, &SubTable->ArgumentsLength);
-
- /* Dump the arguments buffer */
-
-- (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
- AcpiDmTableInfoWpbt0);
- }
-Index: acpica-unix2-20170728/source/compiler/aslrestype2.c
-===================================================================
---- acpica-unix2-20170728.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20170728/source/compiler/aslrestype2.c
-@@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor (
- {
- case 0: /* Address space */
-
-+ /*
- Descriptor->GenericReg.AddressSpaceId = (UINT8) InitializerOp->Asl.Value.Integer;
-+ */
-+ ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.AddressSpaceId,
-+ &InitializerOp->Asl.Value.Integer);
- RsCreateByteField (InitializerOp, ACPI_RESTAG_ADDRESSSPACE,
- CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AddressSpaceId));
- break;
-
- case 1: /* Register Bit Width */
-
-+ /*
- Descriptor->GenericReg.BitWidth = (UINT8) InitializerOp->Asl.Value.Integer;
-+ */
-+ ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.BitWidth,
-+ &InitializerOp->Asl.Value.Integer);
- RsCreateByteField (InitializerOp, ACPI_RESTAG_REGISTERBITWIDTH,
- CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.BitWidth));
- break;
-
- case 2: /* Register Bit Offset */
-
-+ /*
- Descriptor->GenericReg.BitOffset = (UINT8) InitializerOp->Asl.Value.Integer;
-+ */
-+ ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.BitOffset,
-+ &InitializerOp->Asl.Value.Integer);
- RsCreateByteField (InitializerOp, ACPI_RESTAG_REGISTERBITOFFSET,
- CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.BitOffset));
- break;
-@@ -127,7 +139,11 @@ RsDoGeneralRegisterDescriptor (
-
- case 4: /* Access Size (ACPI 3.0) */
-
-+ /*
- Descriptor->GenericReg.AccessSize = (UINT8) InitializerOp->Asl.Value.Integer;
-+ */
-+ ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.AccessSize,
-+ &InitializerOp->Asl.Value.Integer);
- RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE,
- CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize));
-
-Index: acpica-unix2-20170728/source/compiler/dtfield.c
-===================================================================
---- acpica-unix2-20170728.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20170728/source/compiler/dtfield.c
-@@ -360,7 +360,27 @@ DtCompileInteger (
- DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer);
- }
-
-- memcpy (Buffer, &Value, ByteLength);
-+ switch (ByteLength) {
-+ case 1:
-+ ACPI_MOVE_64_TO_8(Buffer, &Value);
-+ break;
-+
-+ case 2:
-+ ACPI_MOVE_64_TO_16(Buffer, &Value);
-+ break;
-+
-+ case 4:
-+ ACPI_MOVE_64_TO_32(Buffer, &Value);
-+ break;
-+
-+ case 8:
-+ ACPI_MOVE_64_TO_64(Buffer, &Value);
-+ break;
-+
-+ default:
-+ memcpy (Buffer, &Value, ByteLength);
-+ break;
-+ }
- return;
- }
-
-Index: acpica-unix2-20170728/source/compiler/dtsubtable.c
-===================================================================
---- acpica-unix2-20170728.orig/source/compiler/dtsubtable.c
-+++ acpica-unix2-20170728/source/compiler/dtsubtable.c
-@@ -379,6 +379,21 @@ DtSetSubtableLength (
- return;
- }
-
-- memcpy (Subtable->LengthField, &Subtable->TotalLength,
-- Subtable->SizeOfLengthField);
-+ switch(Subtable->SizeOfLengthField) {
-+ case 1:
-+ ACPI_MOVE_32_TO_8(Subtable->LengthField, &Subtable->TotalLength);
-+ break;
-+
-+ case 2:
-+ ACPI_MOVE_32_TO_16(Subtable->LengthField, &Subtable->TotalLength);
-+ break;
-+
-+ case 4:
-+ ACPI_MOVE_32_TO_32(Subtable->LengthField, &Subtable->TotalLength);
-+ break;
-+
-+ default:
-+ memcpy (Subtable->LengthField, &Subtable->TotalLength,
-+ Subtable->SizeOfLengthField);
-+ }
- }
-Index: acpica-unix2-20170728/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20170728.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20170728/source/compiler/dttable1.c
-@@ -282,6 +282,8 @@ DtCompileCsrt (
- DT_FIELD **PFieldList = (DT_FIELD **) List;
- UINT32 DescriptorCount;
- UINT32 GroupLength;
-+ ACPI_CSRT_GROUP *Pgrp;
-+ UINT32 Tmp32;
-
-
- /* Subtables (Resource Groups) */
-@@ -300,12 +302,20 @@ DtCompileCsrt (
-
- /* Compute the number of resource descriptors */
-
-+ /*
- GroupLength =
- (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
- Subtable->Buffer))->Length -
- (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
- Subtable->Buffer))->SharedInfoLength -
- sizeof (ACPI_CSRT_GROUP);
-+ */
-+ Pgrp = ACPI_CAST_PTR(ACPI_CSRT_GROUP, Subtable->Buffer);
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Pgrp->Length);
-+ GroupLength = Tmp32;
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Pgrp->SharedInfoLength);
-+ GroupLength -= Tmp32;
-+ GroupLength -= sizeof (ACPI_CSRT_GROUP);
-
- DescriptorCount = (GroupLength /
- sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -393,6 +403,8 @@ DtCompileDbg2 (
- ACPI_DBG2_DEVICE *DeviceInfo;
- UINT16 CurrentOffset;
- UINT32 i;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- /* Main table */
-@@ -409,10 +421,11 @@ DtCompileDbg2 (
- /* Main table fields */
-
- Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
-- Dbg2Header->InfoOffset = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-+ Tmp32 = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
- ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+ ACPI_MOVE_32_TO_32(&Dbg2Header->InfoOffset, &Tmp32);
-
-- SubtableCount = Dbg2Header->InfoCount;
-+ ACPI_MOVE_32_TO_32(&SubtableCount, &Dbg2Header->InfoCount);
- DtPushSubtable (Subtable);
-
- /* Process all Device Information subtables (Count = InfoCount) */
-@@ -439,7 +452,7 @@ DtCompileDbg2 (
-
- /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
-
-- DeviceInfo->BaseAddressOffset = CurrentOffset;
-+ ACPI_MOVE_16_TO_16(&DeviceInfo->BaseAddressOffset, &CurrentOffset);
- for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -455,7 +468,7 @@ DtCompileDbg2 (
-
- /* AddressSize array (Required, size = RegisterCount) */
-
-- DeviceInfo->AddressSizeOffset = CurrentOffset;
-+ ACPI_MOVE_16_TO_16(&DeviceInfo->AddressSizeOffset, &CurrentOffset);
- for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -471,7 +484,7 @@ DtCompileDbg2 (
-
- /* NamespaceString device identifier (Required, size = NamePathLength) */
-
-- DeviceInfo->NamepathOffset = CurrentOffset;
-+ ACPI_MOVE_16_TO_16(&DeviceInfo->NamepathOffset, &CurrentOffset);
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
- &Subtable, TRUE);
- if (ACPI_FAILURE (Status))
-@@ -481,8 +494,9 @@ DtCompileDbg2 (
-
- /* Update the device info header */
-
-- DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
-- CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
-+ ACPI_MOVE_32_TO_16(&DeviceInfo->NamepathLength, &Subtable->Length);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &DeviceInfo->NamepathLength);
-+ CurrentOffset += Tmp16;
- DtInsertSubtable (ParentTable, Subtable);
-
- /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -503,8 +517,8 @@ DtCompileDbg2 (
-
- if (Subtable && Subtable->Length)
- {
-- DeviceInfo->OemDataOffset = CurrentOffset;
-- DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
-+ ACPI_MOVE_16_TO_16(&DeviceInfo->OemDataOffset, &CurrentOffset);
-+ ACPI_MOVE_32_TO_16(&DeviceInfo->OemDataLength, &Subtable->Length);
-
- DtInsertSubtable (ParentTable, Subtable);
- }
-@@ -544,6 +558,8 @@ DtCompileDmar (
- ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope;
- UINT32 DeviceScopeLength;
- UINT32 PciPathLength;
-+ UINT16 Tmp16;
-+ UINT16 HdrType;
-
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable, TRUE);
-@@ -573,8 +589,11 @@ DtCompileDmar (
- DtPushSubtable (Subtable);
-
- DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &DmarHeader->Length);
-+ DmarHeader->Length = Tmp16;
-
-- switch (DmarHeader->Type)
-+ ACPI_MOVE_16_TO_16(&HdrType, &DmarHeader->Type);
-+ switch (HdrType)
- {
- case ACPI_DMAR_TYPE_HARDWARE_UNIT:
-
-@@ -621,8 +640,8 @@ DtCompileDmar (
- /*
- * Optional Device Scope subtables
- */
-- if ((DmarHeader->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-- (DmarHeader->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+ if ((HdrType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+ (HdrType == ACPI_DMAR_TYPE_NAMESPACE))
- {
- /* These types do not support device scopes */
-
-@@ -631,8 +650,8 @@ DtCompileDmar (
- }
-
- DtPushSubtable (Subtable);
-- DeviceScopeLength = DmarHeader->Length - Subtable->Length -
-- ParentTable->Length;
-+ DeviceScopeLength = DmarHeader->Length - Subtable->Length -
-+ ParentTable->Length;
- while (DeviceScopeLength)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
-@@ -757,7 +776,7 @@ DtCompileDrtm (
- Count++;
- }
-
-- DrtmVtl->ValidatedTableCount = Count;
-+ ACPI_MOVE_32_TO_32(&DrtmVtl->ValidatedTableCount, &Count);
- DtPopSubtable ();
- ParentTable = DtPeekSubtable ();
-
-@@ -795,7 +814,7 @@ DtCompileDrtm (
- Count++;
- }
-
-- DrtmRl->ResourceCount = Count;
-+ ACPI_MOVE_32_TO_32(&DrtmRl->ResourceCount, &Count);
- DtPopSubtable ();
- ParentTable = DtPeekSubtable ();
-
-@@ -889,6 +908,7 @@ DtCompileGtdt (
- ACPI_SUBTABLE_HEADER *GtdtHeader;
- ACPI_DMTABLE_INFO *InfoTable;
- UINT32 GtCount;
-+ ACPI_GTDT_TIMER_BLOCK *TimerBlock;
-
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt,
-@@ -955,8 +975,9 @@ DtCompileGtdt (
- DtPushSubtable (Subtable);
- ParentTable = DtPeekSubtable ();
-
-- GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-- Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
-+ TimerBlock = ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+ Subtable->Buffer - sizeof(ACPI_GTDT_HEADER));
-+ ACPI_MOVE_32_TO_32(&GtCount, &TimerBlock->TimerCount);
-
- while (GtCount)
- {
-@@ -1009,6 +1030,7 @@ DtCompileFpdt (
- ACPI_DMTABLE_INFO *InfoTable;
- DT_FIELD **PFieldList = (DT_FIELD **) List;
- DT_FIELD *SubtableStart;
-+ UINT16 HdrType;
-
-
- while (*PFieldList)
-@@ -1027,7 +1049,8 @@ DtCompileFpdt (
-
- FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
-
-- switch (FpdtHeader->Type)
-+ ACPI_MOVE_16_TO_16(&HdrType, &FpdtHeader->Type);
-+ switch (HdrType)
- {
- case ACPI_FPDT_TYPE_BOOT:
-
-@@ -1085,6 +1108,7 @@ DtCompileHest (
- ACPI_DMTABLE_INFO *InfoTable;
- UINT16 Type;
- UINT32 BankCount;
-+ UINT16 Tmp16;
-
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoHest,
-@@ -1102,8 +1126,9 @@ DtCompileHest (
- /* Get subtable type */
-
- SubtableStart = *PFieldList;
-- DtCompileInteger ((UINT8 *) &Type, *PFieldList, 2, 0);
-+ DtCompileInteger ((UINT8 *) &Tmp16, *PFieldList, 2, 0);
-
-+ ACPI_MOVE_16_TO_16(&Type, &Tmp16);
- switch (Type)
- {
- case ACPI_HEST_TYPE_IA32_CHECK:
-@@ -1453,11 +1478,13 @@ DtCompileIort (
- ACPI_IORT_SMMU *IortSmmu;
- UINT32 NodeNumber;
- UINT32 NodeLength;
-+ UINT32 NodeOffset;
- UINT32 IdMappingNumber;
- UINT32 ItsNumber;
- UINT32 ContextIrptNumber;
- UINT32 PmuIrptNumber;
- UINT32 PaddingLength;
-+ UINT32 MappingOffset;
-
-
- ParentTable = DtPeekSubtable ();
-@@ -1483,7 +1510,7 @@ DtCompileIort (
- * Optionally allows the generic data types to be used for filling
- * this field.
- */
-- Iort->NodeOffset = sizeof (ACPI_TABLE_IORT);
-+ NodeOffset = sizeof (ACPI_TABLE_IORT);
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
- &Subtable, TRUE);
- if (ACPI_FAILURE (Status))
-@@ -1493,7 +1520,7 @@ DtCompileIort (
- if (Subtable)
- {
- DtInsertSubtable (ParentTable, Subtable);
-- Iort->NodeOffset += Subtable->Length;
-+ NodeOffset += Subtable->Length;
- }
- else
- {
-@@ -1503,8 +1530,9 @@ DtCompileIort (
- {
- return (Status);
- }
-- Iort->NodeOffset += PaddingLength;
-+ NodeOffset += PaddingLength;
- }
-+ ACPI_MOVE_32_TO_32(&Iort->NodeOffset, &NodeOffset);
-
- NodeNumber = 0;
- while (*PFieldList)
-@@ -1558,7 +1586,7 @@ DtCompileIort (
- ItsNumber++;
- }
-
-- IortItsGroup->ItsCount = ItsNumber;
-+ ACPI_MOVE_32_TO_32(&IortItsGroup->ItsCount, &ItsNumber);
- break;
-
- case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -1592,15 +1620,16 @@ DtCompileIort (
- }
- else
- {
-- if (NodeLength > IortNode->MappingOffset)
-+ ACPI_MOVE_32_TO_32(&MappingOffset, &IortNode->MappingOffset);
-+ if (NodeLength > MappingOffset)
- {
- return (AE_BAD_DATA);
- }
-
-- if (NodeLength < IortNode->MappingOffset)
-+ if (NodeLength < MappingOffset)
- {
- Status = DtCompilePadding (
-- IortNode->MappingOffset - NodeLength,
-+ MappingOffset - NodeLength,
- &Subtable);
- if (ACPI_FAILURE (Status))
- {
-@@ -1608,7 +1637,8 @@ DtCompileIort (
- }
-
- DtInsertSubtable (ParentTable, Subtable);
-- NodeLength = IortNode->MappingOffset;
-+ ACPI_MOVE_32_TO_32(&MappingOffset, &IortNode->MappingOffset);
-+ NodeLength = MappingOffset;
- }
- }
- break;
-@@ -1641,7 +1671,7 @@ DtCompileIort (
-
- /* Compile global interrupt array */
-
-- IortSmmu->GlobalInterruptOffset = NodeLength;
-+ ACPI_MOVE_32_TO_32(&IortSmmu->GlobalInterruptOffset, &NodeLength);
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
- &Subtable, TRUE);
- if (ACPI_FAILURE (Status))
-@@ -1655,7 +1685,7 @@ DtCompileIort (
- /* Compile context interrupt array */
-
- ContextIrptNumber = 0;
-- IortSmmu->ContextInterruptOffset = NodeLength;
-+ ACPI_MOVE_32_TO_32(&IortSmmu->ContextInterruptOffset, &NodeLength);
- while (*PFieldList)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -1675,12 +1705,12 @@ DtCompileIort (
- ContextIrptNumber++;
- }
-
-- IortSmmu->ContextInterruptCount = ContextIrptNumber;
-+ ACPI_MOVE_32_TO_32(&IortSmmu->ContextInterruptCount, &ContextIrptNumber);
-
- /* Compile PMU interrupt array */
-
- PmuIrptNumber = 0;
-- IortSmmu->PmuInterruptOffset = NodeLength;
-+ ACPI_MOVE_32_TO_32(&IortSmmu->PmuInterruptOffset, &NodeLength);
- while (*PFieldList)
- {
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -1700,7 +1730,7 @@ DtCompileIort (
- PmuIrptNumber++;
- }
-
-- IortSmmu->PmuInterruptCount = PmuIrptNumber;
-+ ACPI_MOVE_32_TO_32(&IortSmmu->PmuInterruptCount, &PmuIrptNumber);
- break;
-
- case ACPI_IORT_NODE_SMMU_V3:
-@@ -1724,7 +1754,7 @@ DtCompileIort (
-
- /* Compile Array of ID mappings */
-
-- IortNode->MappingOffset = NodeLength;
-+ ACPI_MOVE_32_TO_32(&IortNode->MappingOffset, &NodeLength);
- IdMappingNumber = 0;
- while (*PFieldList)
- {
-@@ -1745,7 +1775,7 @@ DtCompileIort (
- IdMappingNumber++;
- }
-
-- IortNode->MappingCount = IdMappingNumber;
-+ ACPI_MOVE_32_TO_32(&IortNode->MappingCount, &IdMappingNumber);
- if (!IdMappingNumber)
- {
- IortNode->MappingOffset = 0;
-@@ -1760,7 +1790,7 @@ DtCompileIort (
- NodeNumber++;
- }
-
-- Iort->NodeCount = NodeNumber;
-+ ACPI_MOVE_32_TO_32(&Iort->NodeCount, &NodeNumber);
- return (AE_OK);
- }
-
-Index: acpica-unix2-20170728/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20170728.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20170728/source/compiler/dttable2.c
-@@ -346,7 +346,7 @@ DtCompileMpst (
- DtPushSubtable (Subtable);
-
- MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
-- SubtableCount = MpstChannelInfo->PowerNodeCount;
-+ ACPI_MOVE_16_TO_16(&SubtableCount, &MpstChannelInfo->PowerNodeCount);
-
- while (*PFieldList && SubtableCount)
- {
-@@ -364,8 +364,8 @@ DtCompileMpst (
- DtPushSubtable (Subtable);
-
- MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
-- PowerStateCount = MpstPowerNode->NumPowerStates;
-- ComponentCount = MpstPowerNode->NumPhysicalComponents;
-+ ACPI_MOVE_32_TO_32(&PowerStateCount, &MpstPowerNode->NumPowerStates);
-+ ACPI_MOVE_32_TO_32(&ComponentCount, &MpstPowerNode->NumPhysicalComponents);
-
- ParentTable = DtPeekSubtable ();
-
-@@ -518,6 +518,7 @@ DtCompileNfit (
- UINT32 Count;
- ACPI_NFIT_INTERLEAVE *Interleave = NULL;
- ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-+ UINT16 SubType;
-
-
- /* Main table */
-@@ -551,7 +552,8 @@ DtCompileNfit (
-
- NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
-
-- switch (NfitHeader->Type)
-+ ACPI_MOVE_16_TO_16(&SubType, &NfitHeader->Type);
-+ switch (SubType)
- {
- case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
-
-@@ -606,7 +608,7 @@ DtCompileNfit (
- DtInsertSubtable (ParentTable, Subtable);
- DtPopSubtable ();
-
-- switch (NfitHeader->Type)
-+ switch (SubType)
- {
- case ACPI_NFIT_TYPE_INTERLEAVE:
-
-@@ -632,7 +634,7 @@ DtCompileNfit (
- Count++;
- }
-
-- Interleave->LineCount = Count;
-+ ACPI_MOVE_32_TO_32(&Interleave->LineCount, &Count);
- DtPopSubtable ();
- break;
-
-@@ -678,7 +680,7 @@ DtCompileNfit (
- Count++;
- }
-
-- Hint->HintCount = (UINT16) Count;
-+ ACPI_MOVE_32_TO_16(&Hint->HintCount, &Count);
- DtPopSubtable ();
- break;
-
-@@ -895,7 +897,7 @@ DtCompilePmtt (
-
- PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER,
- (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER)));
-- DomainCount = PmttController->DomainCount;
-+ ACPI_MOVE_16_TO_16(&DomainCount, &PmttController->DomainCount);
-
- while (DomainCount)
- {
-@@ -1115,6 +1117,7 @@ DtCompileS3pt (
- DT_SUBTABLE *ParentTable;
- ACPI_DMTABLE_INFO *InfoTable;
- DT_FIELD *SubtableStart;
-+ UINT16 HdrType;
-
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1142,7 +1145,8 @@ DtCompileS3pt (
-
- S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
-
-- switch (S3ptHeader->Type)
-+ ACPI_MOVE_16_TO_16(&HdrType, &S3ptHeader->Type);
-+ switch (HdrType)
- {
- case ACPI_S3PT_TYPE_RESUME:
-
-@@ -1239,6 +1243,7 @@ DtCompileSlit (
- DT_FIELD *FieldList;
- UINT32 Localities;
- UINT8 *LocalityBuffer;
-+ UINT32 Tmp;
-
-
- Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit,
-@@ -1251,7 +1256,8 @@ DtCompileSlit (
- ParentTable = DtPeekSubtable ();
- DtInsertSubtable (ParentTable, Subtable);
-
-- Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+ Tmp = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+ ACPI_MOVE_32_TO_32(&Localities, &Tmp);
- LocalityBuffer = UtLocalCalloc (Localities);
-
- /* Compile each locality buffer */
-@@ -1445,6 +1451,7 @@ DtCompileTcpa (
- ACPI_TABLE_TCPA_HDR *TcpaHeader;
- DT_SUBTABLE *ParentTable;
- ACPI_STATUS Status;
-+ UINT16 PlatClass;
-
-
- /* Compile the main table */
-@@ -1465,7 +1472,8 @@ DtCompileTcpa (
- */
- TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
-
-- switch (TcpaHeader->PlatformClass)
-+ ACPI_MOVE_16_TO_16(&PlatClass, &TcpaHeader->PlatformClass);
-+ switch (PlatClass)
- {
- case ACPI_TCPA_CLIENT_TABLE:
-
-@@ -1661,6 +1669,9 @@ DtCompileWpbt (
- ACPI_TABLE_WPBT *Table;
- ACPI_STATUS Status;
- UINT16 Length;
-+ UINT16 Tmp16;
-+ UINT16 *Ptr16;
-+ UINT32 ii;
-
-
- /* Compile the main table */
-@@ -1688,7 +1699,16 @@ DtCompileWpbt (
-
- Length = (UINT16) Subtable->TotalLength;
- Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
-- Table->ArgumentsLength = Length;
-+ ACPI_MOVE_16_TO_16(&Table->ArgumentsLength, &Length);
-+
-+ /* The arguments are in Unicode, so make sure the byte order is correct */
-+ Ptr16 = (UINT16 *)Subtable->Buffer;
-+ for (ii = 0; ii < Length; ii++)
-+ {
-+ ACPI_MOVE_16_TO_16(&Tmp16, Ptr16);
-+ *Ptr16 = Tmp16;
-+ Ptr16++;
-+ }
-
- ParentTable = DtPeekSubtable ();
- DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix2-20170728/source/components/disassembler/dmbuffer.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20170728/source/components/disassembler/dmbuffer.c
-@@ -204,7 +204,7 @@ AcpiDmByteList (
-
-
- ByteData = Op->Named.Data;
-- ByteCount = (UINT32) Op->Common.Value.Integer;
-+ ByteCount = (UINT32) Op->Common.Value.Size;
-
- /*
- * The byte list belongs to a buffer, and can be produced by either
-@@ -304,7 +304,8 @@ AcpiDmIsUuidBuffer (
- /* Extract the byte list info */
-
- ByteData = NextOp->Named.Data;
-- ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+ /* ByteCount = (UINT32) NextOp->Common.Value.Integer; */
-+ ByteCount = (UINT32) NextOp->Common.Value.Size;
-
- /* Byte count must be exactly 16 */
-
-@@ -424,7 +425,8 @@ AcpiDmIsUnicodeBuffer (
- /* Extract the byte list info */
-
- ByteData = NextOp->Named.Data;
-- ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+ /* ByteCount = (UINT32) NextOp->Common.Value.Integer; */
-+ ByteCount = (UINT32) NextOp->Common.Value.Size;
- WordCount = ACPI_DIV_2 (ByteCount);
-
- /*
-@@ -852,19 +854,22 @@ AcpiDmUnicode (
- UINT32 WordCount;
- UINT32 i;
- int OutputValue;
-+ UINT16 Tmp16;
-
-
- /* Extract the buffer info as a WORD buffer */
-
- WordData = ACPI_CAST_PTR (UINT16, Op->Named.Data);
-- WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Integer));
-+ WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Size));
-
- /* Write every other byte as an ASCII character */
-
- AcpiOsPrintf ("\"");
- for (i = 0; i < (WordCount - 1); i++)
- {
-- OutputValue = (int) WordData[i];
-+ /* OutputValue = (int) WordData[i]; */
-+ ACPI_MOVE_16_TO_16(&Tmp16, &WordData[i]);
-+ OutputValue = (int) Tmp16;
-
- /* Handle values that must be escaped */
-
-@@ -973,16 +978,18 @@ AcpiDmCheckForHardwareId (
- ACPI_PARSE_OBJECT *Op)
- {
- UINT32 Name;
-+ UINT32 TmpName;
- ACPI_PARSE_OBJECT *NextOp;
-
-
- /* Get the NameSegment */
-
-- Name = AcpiPsGetName (Op);
-- if (!Name)
-+ TmpName = AcpiPsGetName (Op);
-+ if (!TmpName)
- {
- return;
- }
-+ ACPI_MOVE_32_TO_32(&Name, &TmpName);
-
- NextOp = AcpiPsGetDepthNext (NULL, Op);
- if (!NextOp)
-Index: acpica-unix2-20170728/source/components/disassembler/dmopcode.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix2-20170728/source/components/disassembler/dmopcode.c
-@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
- char *NameString;
- int LastCharIsDigit;
- int LastCharsAreHex;
-+ char TmpName[ACPI_NAME_SIZE + 1];
-
-
- if (!Op)
-@@ -261,7 +262,9 @@ AcpiDmPredefinedDescription (
-
- /* Predefined name must start with an underscore */
-
-- NameString = ACPI_CAST_PTR (char, &Op->Named.Name);
-+ memset(TmpName, 0, ACPI_NAME_SIZE + 1);
-+ ACPI_MOVE_32_TO_32(TmpName, &Op->Named.Name);
-+ NameString = TmpName;
- if (NameString[0] != '_')
- {
- return;
-@@ -880,25 +883,29 @@ AcpiDmDisassembleOneOp (
- AcpiDmNamestring (Op->Common.Value.Name);
- break;
-
-- case AML_INT_NAMEDFIELD_OP:
-+ case AML_INT_NAMEDFIELD_OP: {
-
-- Length = AcpiDmDumpName (Op->Named.Name);
-+ UINT32 TmpName;
-+
-+ ACPI_MOVE_32_TO_32(&TmpName, &Op->Named.Name);
-+ Length = AcpiDmDumpName (TmpName);
-
- AcpiOsPrintf (",");
- ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
- AcpiOsPrintf ("%*.s %u", (unsigned) (5 - Length), " ",
-- (UINT32) Op->Common.Value.Integer);
-+ (UINT32) Op->Common.Value.Size);
-
- AcpiDmCommaIfFieldMember (Op);
-
-- Info->BitOffset += (UINT32) Op->Common.Value.Integer;
-+ Info->BitOffset += (UINT32) Op->Common.Value.Size;
- break;
-+ }
-
- case AML_INT_RESERVEDFIELD_OP:
-
- /* Offset() -- Must account for previous offsets */
-
-- Offset = (UINT32) Op->Common.Value.Integer;
-+ Offset = Op->Common.Value.Size;
- Info->BitOffset += Offset;
-
- if (Info->BitOffset % 8 == 0)
-Index: acpica-unix2-20170728/source/components/disassembler/dmresrcl2.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix2-20170728/source/components/disassembler/dmresrcl2.c
-@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
- char *DeviceName = NULL;
- UINT32 PinCount;
- UINT32 i;
-+ UINT16 Tmp16;
-
-
- /* ResourceSource, ResourceSourceIndex, ResourceType */
-
- AcpiDmIndent (Level + 1);
-- if (Resource->Gpio.ResSourceOffset)
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.ResSourceOffset);
-+ if (Tmp16)
- {
-- DeviceName = ACPI_ADD_PTR (char,
-- Resource, Resource->Gpio.ResSourceOffset),
-+ DeviceName = ACPI_ADD_PTR (char, Resource, Tmp16),
- AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
- }
-
- AcpiOsPrintf (", ");
- AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.Flags);
- AcpiOsPrintf ("%s, ",
-- AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
-+ AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
-
- /* Insert a descriptor name */
-
-@@ -215,15 +217,16 @@ AcpiDmGpioCommon (
-
- /* Dump the vendor data */
-
-- if (Resource->Gpio.VendorOffset)
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorOffset);
-+ if (Tmp16)
- {
- AcpiOsPrintf ("\n");
- AcpiDmIndent (Level + 1);
-- VendorData = ACPI_ADD_PTR (UINT8, Resource,
-- Resource->Gpio.VendorOffset);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorOffset);
-+ VendorData = ACPI_ADD_PTR (UINT8, Resource, Tmp16);
-
-- AcpiDmDumpRawDataBuffer (VendorData,
-- Resource->Gpio.VendorLength, Level);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorLength);
-+ AcpiDmDumpRawDataBuffer (VendorData, Tmp16, Level);
- }
-
- AcpiOsPrintf (")\n");
-@@ -233,17 +236,25 @@ AcpiDmGpioCommon (
- AcpiDmIndent (Level + 1);
- AcpiOsPrintf ("{ // Pin list\n");
-
-+ /*
- PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
- Resource->Gpio.PinTableOffset)) /
- sizeof (UINT16);
-+ */
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.ResSourceOffset);
-+ PinCount = (UINT32) Tmp16;
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.PinTableOffset);
-+ PinCount -= (UINT32) Tmp16;
-+ PinCount /= sizeof (UINT16);
-
-- PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
-- Resource->Gpio.PinTableOffset);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.PinTableOffset);
-+ PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource, Tmp16);
-
- for (i = 0; i < PinCount; i++)
- {
- AcpiDmIndent (Level + 2);
-- AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+ ACPI_MOVE_16_TO_16(&Tmp16, &PinList[i]);
-+ AcpiOsPrintf ("0x%4.4X%s\n", Tmp16,
- ((i + 1) < PinCount) ? "," : "");
- }
-
-@@ -277,16 +288,18 @@ AcpiDmGpioIntDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT16 Tmp16;
-
- /* Dump the GpioInt-specific portion of the descriptor */
-
- /* EdgeLevel, ActiveLevel, Shared */
-
- AcpiDmIndent (Level);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
- AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
-- AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
-- AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
-- AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+ AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
-+ AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 1)],
-+ AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
-
- /* PinConfig, DebounceTimeout */
-
-@@ -299,7 +312,8 @@ AcpiDmGpioIntDescriptor (
- {
- AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
- }
-- AcpiOsPrintf ("0x%4.4X,\n", Resource->Gpio.DebounceTimeout);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DebounceTimeout);
-+ AcpiOsPrintf ("0x%4.4X,\n", Tmp16);
-
- /* Dump the GpioInt/GpioIo common portion of the descriptor */
-
-@@ -329,14 +343,16 @@ AcpiDmGpioIoDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT16 Tmp16;
-
- /* Dump the GpioIo-specific portion of the descriptor */
-
- /* Shared, PinConfig */
-
- AcpiDmIndent (Level);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
- AcpiOsPrintf ("GpioIo (%s, ",
-- AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+ AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
-
- if (Resource->Gpio.PinConfig <= 3)
- {
-@@ -350,10 +366,13 @@ AcpiDmGpioIoDescriptor (
-
- /* DebounceTimeout, DriveStrength, IoRestriction */
-
-- AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
-- AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DebounceTimeout);
-+ AcpiOsPrintf ("0x%4.4X, ", Tmp16);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DriveStrength);
-+ AcpiOsPrintf ("0x%4.4X, ", Tmp16);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
- AcpiOsPrintf ("%s,\n",
-- AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
-+ AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Tmp16)]);
-
- /* Dump the GpioInt/GpioIo common portion of the descriptor */
-
-@@ -533,6 +552,7 @@ AcpiDmDumpSerialBusVendorData (
- {
- UINT8 *VendorData;
- UINT32 VendorLength;
-+ UINT16 Tmp16;
-
-
- /* Get the (optional) vendor data and length */
-@@ -541,8 +561,8 @@ AcpiDmDumpSerialBusVendorData (
- {
- case AML_RESOURCE_I2C_SERIALBUSTYPE:
-
-- VendorLength = Resource->CommonSerialBus.TypeDataLength -
-- AML_RESOURCE_I2C_MIN_DATA_LEN;
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+ VendorLength = Tmp16 - AML_RESOURCE_I2C_MIN_DATA_LEN;
-
- VendorData = ACPI_ADD_PTR (UINT8, Resource,
- sizeof (AML_RESOURCE_I2C_SERIALBUS));
-@@ -550,8 +570,8 @@ AcpiDmDumpSerialBusVendorData (
-
- case AML_RESOURCE_SPI_SERIALBUSTYPE:
-
-- VendorLength = Resource->CommonSerialBus.TypeDataLength -
-- AML_RESOURCE_SPI_MIN_DATA_LEN;
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+ VendorLength = Tmp16 - AML_RESOURCE_SPI_MIN_DATA_LEN;
-
- VendorData = ACPI_ADD_PTR (UINT8, Resource,
- sizeof (AML_RESOURCE_SPI_SERIALBUS));
-@@ -559,8 +579,8 @@ AcpiDmDumpSerialBusVendorData (
-
- case AML_RESOURCE_UART_SERIALBUSTYPE:
-
-- VendorLength = Resource->CommonSerialBus.TypeDataLength -
-- AML_RESOURCE_UART_MIN_DATA_LEN;
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+ VendorLength = Tmp16 - AML_RESOURCE_UART_MIN_DATA_LEN;
-
- VendorData = ACPI_ADD_PTR (UINT8, Resource,
- sizeof (AML_RESOURCE_UART_SERIALBUS));
-@@ -601,15 +621,19 @@ AcpiDmI2cSerialBusDescriptor (
- {
- UINT32 ResourceSourceOffset;
- char *DeviceName;
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
-
- /* SlaveAddress, SlaveMode, ConnectionSpeed, AddressingMode */
-
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->I2cSerialBus.SlaveAddress);
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Resource->I2cSerialBus.ConnectionSpeed);
- AcpiDmIndent (Level);
- AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
-- Resource->I2cSerialBus.SlaveAddress,
-+ Tmp16,
- AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
-- Resource->I2cSerialBus.ConnectionSpeed);
-+ Tmp32);
-
- AcpiDmIndent (Level + 1);
- AcpiOsPrintf ("%s, ",
-@@ -617,8 +641,8 @@ AcpiDmI2cSerialBusDescriptor (
-
- /* ResourceSource is a required field */
-
-- ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
-- Resource->CommonSerialBus.TypeDataLength;
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+ ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) + Tmp16;
-
- DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
- AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix2-20170728/source/components/disassembler/dmresrcl.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix2-20170728/source/components/disassembler/dmresrcl.c
-@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
- UINT32 Level)
- {
- UINT32 i;
--
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
- for (i = 0; i < 4; i++)
- {
-@@ -151,14 +152,14 @@ AcpiDmMemoryFields (
- {
- case 16:
-
-- AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
-- AcpiDmMemoryNames[i]);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &(ACPI_CAST_PTR (UINT16, Source)[i]));
-+ AcpiDmDumpInteger16 (Tmp16, AcpiDmMemoryNames[i]);
- break;
-
- case 32:
-
-- AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
-- AcpiDmMemoryNames[i]);
-+ ACPI_MOVE_32_TO_32(&Tmp32, &(ACPI_CAST_PTR (UINT32, Source)[i]));
-+ AcpiDmDumpInteger32 (Tmp32, AcpiDmMemoryNames[i]);
- break;
-
- default:
-@@ -190,7 +191,9 @@ AcpiDmAddressFields (
- UINT32 Level)
- {
- UINT32 i;
--
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-+ UINT64 Tmp64;
-
- AcpiOsPrintf ("\n");
-
-@@ -202,20 +205,20 @@ AcpiDmAddressFields (
- {
- case 16:
-
-- AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
-- AcpiDmAddressNames[i]);
-+ ACPI_MOVE_16_TO_16(&Tmp16, &(ACPI_CAST_PTR (UINT16, Source)[i]));
-+ AcpiDmDumpInteger16 (Tmp16, AcpiDmAddressNames[i]);
- break;
-
- case 32:
-
-- AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
-- AcpiDmAddressNames[i]);
-+ ACPI_MOVE_32_TO_32(&Tmp32, &(ACPI_CAST_PTR (UINT32, Source)[i]));
-+ AcpiDmDumpInteger32 (Tmp32, AcpiDmAddressNames[i]);
- break;
-
- case 64:
-
-- AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i],
-- AcpiDmAddressNames[i]);
-+ ACPI_MOVE_64_TO_64(&Tmp64, &(ACPI_CAST_PTR (UINT64, Source)[i]));
-+ AcpiDmDumpInteger64 (Tmp64, AcpiDmAddressNames[i]);
- break;
-
- default:
-@@ -868,6 +871,7 @@ AcpiDmFixedMemory32Descriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT32 Tmp;
-
- /* Dump name and read/write flag */
-
-@@ -876,12 +880,12 @@ AcpiDmFixedMemory32Descriptor (
- AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger32 (Resource->FixedMemory32.Address,
-- "Address Base");
-+ ACPI_MOVE_32_TO_32(&Tmp, &Resource->FixedMemory32.Address);
-+ AcpiDmDumpInteger32 (Tmp, "Address Base");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger32 (Resource->FixedMemory32.AddressLength,
-- "Address Length");
-+ ACPI_MOVE_32_TO_32(&Tmp, &Resource->FixedMemory32.AddressLength);
-+ AcpiDmDumpInteger32 (Tmp, "Address Length");
-
- /* Insert a descriptor name */
-
-@@ -913,6 +917,7 @@ AcpiDmGenericRegisterDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT64 Tmp64;
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("Register (");
-@@ -926,7 +931,9 @@ AcpiDmGenericRegisterDescriptor (
- AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address");
-+ /* AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address"); */
-+ ACPI_MOVE_64_TO_64(&Tmp64, &Resource->GenericReg.Address);
-+ AcpiDmDumpInteger64 (Tmp64, "Address");
-
- /* Optional field for ACPI 3.0 */
-
-@@ -972,7 +979,7 @@ AcpiDmInterruptDescriptor (
- UINT32 Level)
- {
- UINT32 i;
--
-+ UINT16 Tmp16;
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("Interrupt (%s, %s, %s, %s, ",
-@@ -986,10 +993,11 @@ AcpiDmInterruptDescriptor (
- * list. Must compute length based on length of the list. First xrupt
- * is included in the struct (reason for -1 below)
- */
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->ExtendedIrq.ResourceLength);
- AcpiDmResourceSource (Resource,
- sizeof (AML_RESOURCE_EXTENDED_IRQ) +
- ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
-- Resource->ExtendedIrq.ResourceLength);
-+ Tmp16);
-
- /* Insert a descriptor name */
-
-@@ -1002,9 +1010,12 @@ AcpiDmInterruptDescriptor (
- AcpiOsPrintf ("{\n");
- for (i = 0; i < Resource->ExtendedIrq.InterruptCount; i++)
- {
-+ UINT32 Tmp32, Val32;
-+
- AcpiDmIndent (Level + 1);
-- AcpiOsPrintf ("0x%8.8X,\n",
-- (UINT32) Resource->ExtendedIrq.Interrupts[i]);
-+ Val32 = (UINT32) Resource->ExtendedIrq.Interrupts[i];
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Val32);
-+ AcpiOsPrintf ("0x%8.8X,\n", Tmp32);
- }
-
- AcpiDmIndent (Level);
-Index: acpica-unix2-20170728/source/components/disassembler/dmresrcs.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix2-20170728/source/components/disassembler/dmresrcs.c
-@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT16 Tmp;
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("%s (",
-@@ -93,7 +94,8 @@ AcpiDmIrqDescriptor (
- AcpiOsPrintf (")\n");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmBitList (Resource->Irq.IrqMask);
-+ ACPI_MOVE_16_TO_16(&Tmp, &Resource->Irq.IrqMask);
-+ AcpiDmBitList (Tmp);
- }
-
-
-@@ -204,16 +206,19 @@ AcpiDmIoDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT16 Tmp16;
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("IO (%s,\n",
- AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Io.Minimum);
-+ AcpiDmDumpInteger16 (Tmp16, "Range Minimum");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger16 (Resource->Io.Maximum, "Range Maximum");
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Io.Maximum);
-+ AcpiDmDumpInteger16 (Tmp16, "Range Maximum");
-
- AcpiDmIndent (Level + 1);
- AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
-@@ -251,12 +256,14 @@ AcpiDmFixedIoDescriptor (
- UINT32 Length,
- UINT32 Level)
- {
-+ UINT16 Tmp16;
-
- AcpiDmIndent (Level);
- AcpiOsPrintf ("FixedIO (\n");
-
- AcpiDmIndent (Level + 1);
-- AcpiDmDumpInteger16 (Resource->FixedIo.Address, "Address");
-+ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->FixedIo.Address);
-+ AcpiDmDumpInteger16 (Tmp16, "Address");
-
- AcpiDmIndent (Level + 1);
- AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix2-20170728/source/components/dispatcher/dsfield.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix2-20170728/source/components/dispatcher/dsfield.c
-@@ -320,6 +320,7 @@ AcpiDsGetFieldNames (
- ACPI_STATUS Status;
- UINT64 Position;
- ACPI_PARSE_OBJECT *Child;
-+ UINT32 TmpName;
-
-
- ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
-@@ -426,10 +427,17 @@ AcpiDsGetFieldNames (
-
- /* Lookup the name, it should already exist */
-
-+ ACPI_MOVE_32_TO_32(&TmpName, &Arg->Named.Name);
-+ Status = AcpiNsLookup (WalkState->ScopeInfo,
-+ (char *) &TmpName, Info->FieldType,
-+ ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
-+ WalkState, &Info->FieldNode);
-+ /*
- Status = AcpiNsLookup (WalkState->ScopeInfo,
- (char *) &Arg->Named.Name, Info->FieldType,
- ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
- WalkState, &Info->FieldNode);
-+ */
- if (ACPI_FAILURE (Status))
- {
- ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status);
-@@ -656,9 +664,17 @@ AcpiDsInitFieldObjects (
- */
- if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
- {
-+ UINT32 TmpName;
-+
-+ ACPI_MOVE_32_TO_32(&TmpName, &Arg->Named.Name);
-+ Status = AcpiNsLookup (WalkState->ScopeInfo,
-+ (char *) &TmpName, Type, ACPI_IMODE_LOAD_PASS1,
-+ Flags, WalkState, &Node);
-+ /*
- Status = AcpiNsLookup (WalkState->ScopeInfo,
- (char *) &Arg->Named.Name, Type, ACPI_IMODE_LOAD_PASS1,
- Flags, WalkState, &Node);
-+ */
- if (ACPI_FAILURE (Status))
- {
- ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status);
-Index: acpica-unix2-20170728/source/components/events/evgpeblk.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/events/evgpeblk.c
-+++ acpica-unix2-20170728/source/components/events/evgpeblk.c
-@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
- ACPI_STATUS Status;
- ACPI_GPE_BLOCK_INFO *GpeBlock;
- ACPI_GPE_WALK_INFO WalkInfo;
-+ char Name[ACPI_NAME_SIZE + 1];
-
-
- ACPI_FUNCTION_TRACE (EvCreateGpeBlock);
-@@ -396,7 +397,7 @@ AcpiEvCreateGpeBlock (
-
- /* Initialize the new GPE block */
-
-- GpeBlock->Address = Address;
-+ ACPI_MOVE_64_TO_64(&GpeBlock->Address, &Address);
- GpeBlock->SpaceId = SpaceId;
- GpeBlock->Node = GpeDevice;
- GpeBlock->GpeCount = (UINT16) (RegisterCount * ACPI_GPE_REGISTER_WIDTH);
-@@ -445,11 +446,13 @@ AcpiEvCreateGpeBlock (
- (*ReturnGpeBlock) = GpeBlock;
- }
-
-+ memset(&Name, 0, ACPI_NAME_SIZE + 1);
-+ ACPI_MOVE_32_TO_32(&Name, &GpeDevice->Name.Ascii);
- ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
- " Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n",
- (UINT32) GpeBlock->BlockBaseNumber,
- (UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1)),
-- GpeDevice->Name.Ascii, GpeBlock->RegisterCount, InterruptNumber,
-+ Name, GpeBlock->RegisterCount, InterruptNumber,
- InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
-
- /* Update global count of currently available GPEs */
-Index: acpica-unix2-20170728/source/components/hardware/hwregs.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20170728/source/components/hardware/hwregs.c
-@@ -197,7 +197,7 @@ AcpiHwValidateRegister (
- * Address must not be null. A null address also indicates an optional
- * ACPI register that is not supported, so no error message.
- */
-- ACPI_MOVE_64_TO_64 (Address, &Reg->Address);
-+ *Address = Reg->Address;
- if (!(*Address))
- {
- return (AE_BAD_ADDRESS);
-Index: acpica-unix2-20170728/source/components/hardware/hwvalid.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix2-20170728/source/components/hardware/hwvalid.c
-@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
- UINT32 ByteWidth;
- ACPI_IO_ADDRESS LastAddress;
- const ACPI_PORT_INFO *PortInfo;
-+ UINT64 Max16;
-+ UINT64 Tmp64;
-
-
- ACPI_FUNCTION_NAME (HwValidateIoRequest);
-@@ -161,7 +163,10 @@ AcpiHwValidateIoRequest (
-
- /* Maximum 16-bit address in I/O space */
-
-- if (LastAddress > ACPI_UINT16_MAX)
-+ Max16 = (UINT64) ACPI_UINT16_MAX;
-+ ACPI_MOVE_64_TO_64(&Tmp64, &Max16);
-+
-+ if ((UINT64)LastAddress > Tmp64)
- {
- ACPI_ERROR ((AE_INFO,
- "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix2-20170728/source/components/namespace/nsaccess.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix2-20170728/source/components/namespace/nsaccess.c
-@@ -313,6 +313,7 @@ AcpiNsLookup (
- ACPI_OBJECT_TYPE ThisSearchType;
- UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
- UINT32 LocalFlags;
-+ UINT32 Tmp32;
-
-
- ACPI_FUNCTION_TRACE (NsLookup);
-@@ -702,9 +703,10 @@ AcpiNsLookup (
- {
- /* Complain about a type mismatch */
-
-+ ACPI_MOVE_32_TO_32(&Tmp32, &SimpleName);
- ACPI_WARNING ((AE_INFO,
- "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",
-- ACPI_CAST_PTR (char, &SimpleName),
-+ ACPI_CAST_PTR (char, &Tmp32),
- AcpiUtGetTypeName (ThisNode->Type),
- AcpiUtGetTypeName (TypeToCheckFor)));
- }
-Index: acpica-unix2-20170728/source/components/namespace/nsparse.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/namespace/nsparse.c
-+++ acpica-unix2-20170728/source/components/namespace/nsparse.c
-@@ -196,13 +196,14 @@ AcpiNsOneCompleteParse (
-
- /* Table must consist of at least a complete header */
-
-- if (Table->Length < sizeof (ACPI_TABLE_HEADER))
-+ ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);
-+ if (AmlLength < sizeof (ACPI_TABLE_HEADER))
- {
- return_ACPI_STATUS (AE_BAD_HEADER);
- }
-
- AmlStart = (UINT8 *) Table + sizeof (ACPI_TABLE_HEADER);
-- AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+ AmlLength -= sizeof (ACPI_TABLE_HEADER);
-
- Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
- if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20170728/source/components/tables/tbdata.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/tables/tbdata.c
-+++ acpica-unix2-20170728/source/components/tables/tbdata.c
-@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
- UINT32 *TableIndex)
- {
- ACPI_STATUS Status = AE_OK;
-+ UINT32 Length;
-
-
- ACPI_FUNCTION_TRACE (TbVerifyTempTable);
-@@ -581,7 +582,8 @@ AcpiTbVerifyTempTable (
- {
- /* Verify the checksum */
-
-- Status = AcpiTbVerifyChecksum (TableDesc->Pointer, TableDesc->Length);
-+ ACPI_MOVE_32_TO_32(&Length, &TableDesc->Length);
-+ Status = AcpiTbVerifyChecksum (TableDesc->Pointer, Length);
- if (ACPI_FAILURE (Status))
- {
- ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20170728/source/components/tables/tbfadt.c
-@@ -520,6 +520,8 @@ AcpiTbConvertFadt (
- UINT8 Length;
- UINT8 Flags;
- UINT32 i;
-+ UINT32 Tmp32;
-+ UINT64 Tmp64;
-
-
- /*
-@@ -533,7 +535,8 @@ AcpiTbConvertFadt (
- * Note: The FADT revision value is unreliable. Only the length can be
- * trusted.
- */
-- if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE)
-+ ACPI_MOVE_32_TO_32(&Tmp32, &AcpiGbl_FADT.Header.Length);
-+ if (Tmp32 <= ACPI_FADT_V2_SIZE)
- {
- AcpiGbl_FADT.PreferredProfile = 0;
- AcpiGbl_FADT.PstateControl = 0;
-@@ -546,14 +549,15 @@ AcpiTbConvertFadt (
- * current FADT version as defined by the ACPI specification.
- * Thus, we will have a common FADT internally.
- */
-- AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
-+ Tmp32 = sizeof (ACPI_TABLE_FADT);
-+ ACPI_MOVE_32_TO_32(&AcpiGbl_FADT.Header.Length, &Tmp32);
-
- /*
- * Expand the 32-bit DSDT addresses to 64-bit as necessary.
- * Later ACPICA code will always use the X 64-bit field.
- */
-- AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
-- AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+ Tmp64 = AcpiTbSelectAddress ("DSDT", AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+ ACPI_MOVE_64_TO_64(&AcpiGbl_FADT.XDsdt, &Tmp64);
-
- /* If Hardware Reduced flag is set, we are all done */
-
-@@ -614,7 +618,9 @@ AcpiTbConvertFadt (
- {
- if (Address64->Address)
- {
-- if (Address64->Address != (UINT64) Address32)
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Address32);
-+ ACPI_MOVE_64_TO_64(&Tmp64, &Address64->Address);
-+ if (Tmp64 != (UINT64) Tmp32)
- {
- /* Address mismatch */
-
-@@ -655,9 +661,11 @@ AcpiTbConvertFadt (
- */
- if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
- {
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Address32); /* back to host order */
-+ Tmp64 = (UINT64) Tmp32; /* promote only */
- AcpiTbInitGenericAddress (Address64,
- ACPI_ADR_SPACE_SYSTEM_IO, Length,
-- (UINT64) Address32, Name, Flags);
-+ Tmp64, Name, Flags);
- }
- }
-
-@@ -780,10 +788,14 @@ AcpiTbSetupFadtRegisters (
-
- if (Source64->Address)
- {
-+ UINT64 Tmp64, Addr64;
-+
-+ ACPI_MOVE_64_TO_64(&Tmp64, &Source64->Address);
-+ Tmp64 += (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
-+ ACPI_MOVE_64_TO_64(&Addr64, &Tmp64);
- AcpiTbInitGenericAddress (FadtPmInfoTable[i].Target,
- Source64->SpaceId, Pm1RegisterByteWidth,
-- Source64->Address +
-- (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth),
-+ Addr64,
- "PmRegisters", 0);
- }
- }
-Index: acpica-unix2-20170728/source/components/tables/tbfind.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/tables/tbfind.c
-+++ acpica-unix2-20170728/source/components/tables/tbfind.c
-@@ -108,8 +108,11 @@ AcpiTbFindTable (
- (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
- for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
- {
-+ UINT32 Tmp32;
-+
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Header.Signature);
- if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature),
-- Header.Signature, ACPI_NAME_SIZE))
-+ &Tmp32, ACPI_NAME_SIZE))
- {
- /* Not the requested table */
-
-Index: acpica-unix2-20170728/source/components/tables/tbprint.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/tables/tbprint.c
-+++ acpica-unix2-20170728/source/components/tables/tbprint.c
-@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
- ACPI_TABLE_HEADER *Header)
- {
- ACPI_TABLE_HEADER LocalHeader;
-+ UINT32 Len;
-+ UINT32 OemRev;
-+ UINT32 CompilerRev;
-
-
- if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_FACS))
- {
- /* FACS only has signature and length fields */
-
-+ ACPI_MOVE_32_TO_32(&Len, &Header->Length);
- ACPI_INFO (("%-4.4s 0x%8.8X%8.8X %06X",
-- Header->Signature, ACPI_FORMAT_UINT64 (Address),
-- Header->Length));
-+ Header->Signature, ACPI_FORMAT_UINT64 (Address), Len));
- }
- else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature))
- {
-@@ -174,13 +177,16 @@ AcpiTbPrintTableHeader (
-
- AcpiTbCleanupTableHeader (&LocalHeader, Header);
-
-+ ACPI_MOVE_32_TO_32(&Len, &LocalHeader.Length);
-+ ACPI_MOVE_32_TO_32(&OemRev, &LocalHeader.OemRevision);
-+ ACPI_MOVE_32_TO_32(&CompilerRev, &LocalHeader.AslCompilerRevision);
- ACPI_INFO ((
- "%-4.4s 0x%8.8X%8.8X"
- " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
- LocalHeader.Signature, ACPI_FORMAT_UINT64 (Address),
-- LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
-- LocalHeader.OemTableId, LocalHeader.OemRevision,
-- LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
-+ Len, LocalHeader.Revision, LocalHeader.OemId,
-+ LocalHeader.OemTableId, OemRev,
-+ LocalHeader.AslCompilerId, CompilerRev));
- }
- }
-
-Index: acpica-unix2-20170728/source/components/tables/tbutils.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/tables/tbutils.c
-+++ acpica-unix2-20170728/source/components/tables/tbutils.c
-@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
- * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
- * return 64-bit
- */
-- ACPI_MOVE_64_TO_64 (&Address64, TableEntry);
-+ Address64 = (UINT64) TableEntry;
-
- #if ACPI_MACHINE_WIDTH == 32
- if (Address64 > ACPI_UINT32_MAX)
-@@ -251,7 +251,8 @@ AcpiTbGetRootTableEntry (
- ACPI_FORMAT_UINT64 (Address64)));
- }
- #endif
-- return ((ACPI_PHYSICAL_ADDRESS) (Address64));
-+ return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-+ UINT64, Address64)));
- }
- }
-
-@@ -287,6 +288,7 @@ AcpiTbParseRootTable (
- UINT8 *TableEntry;
- ACPI_STATUS Status;
- UINT32 TableIndex;
-+ UINT32 Tmp32;
-
-
- ACPI_FUNCTION_TRACE (TbParseRootTable);
-@@ -345,7 +347,7 @@ AcpiTbParseRootTable (
- * Validate length of the table, and map entire table.
- * Minimum length table must contain at least one entry.
- */
-- Length = Table->Length;
-+ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
- AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
-
- if (Length < (sizeof (ACPI_TABLE_HEADER) + TableEntrySize))
-@@ -372,7 +374,7 @@ AcpiTbParseRootTable (
-
- /* Get the number of entries and pointer to first entry */
-
-- TableCount = (UINT32) ((Table->Length - sizeof (ACPI_TABLE_HEADER)) /
-+ TableCount = (UINT32) ((Length - sizeof (ACPI_TABLE_HEADER)) /
- TableEntrySize);
- TableEntry = ACPI_ADD_PTR (UINT8, Table, sizeof (ACPI_TABLE_HEADER));
-
-@@ -394,10 +396,10 @@ AcpiTbParseRootTable (
- Status = AcpiTbInstallStandardTable (Address,
- ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex);
-
-+ ACPI_MOVE_32_TO_32(&Tmp32,
-+ &AcpiGbl_RootTableList.Tables[TableIndex].Signature);
- if (ACPI_SUCCESS (Status) &&
-- ACPI_COMPARE_NAME (
-- &AcpiGbl_RootTableList.Tables[TableIndex].Signature,
-- ACPI_SIG_FADT))
-+ ACPI_COMPARE_NAME (&Tmp32, ACPI_SIG_FADT))
- {
- AcpiGbl_FadtIndex = TableIndex;
- AcpiTbParseFadt ();
-Index: acpica-unix2-20170728/source/components/tables/tbxface.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/tables/tbxface.c
-+++ acpica-unix2-20170728/source/components/tables/tbxface.c
-@@ -290,8 +290,11 @@ AcpiGetTableHeader (
-
- for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
- {
-+ UINT32 Tmp32;
-+
-+ ACPI_MOVE_32_TO_32(&Tmp32, (UINT32 *)Signature);
- if (!ACPI_COMPARE_NAME (
-- &(AcpiGbl_RootTableList.Tables[i].Signature), Signature))
-+ &(AcpiGbl_RootTableList.Tables[i].Signature), &Tmp32))
- {
- continue;
- }
-Index: acpica-unix2-20170728/source/components/tables/tbxfload.c
-===================================================================
---- acpica-unix2-20170728.orig/source/components/tables/tbxfload.c
-+++ acpica-unix2-20170728/source/components/tables/tbxfload.c
-@@ -156,6 +156,7 @@ AcpiTbLoadNamespace (
- ACPI_TABLE_DESC *Table;
- UINT32 TablesLoaded = 0;
- UINT32 TablesFailed = 0;
-+ UINT32 Tmp32;
-
-
- ACPI_FUNCTION_TRACE (TbLoadNamespace);
-@@ -169,8 +170,9 @@ AcpiTbLoadNamespace (
- */
- Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex];
-
-+ ACPI_MOVE_32_TO_32(&Tmp32, &Table->Signature.Ascii);
- if (!AcpiGbl_RootTableList.CurrentTableCount ||
-- !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_DSDT) ||
-+ !ACPI_COMPARE_NAME (&Tmp32, ACPI_SIG_DSDT) ||
- ACPI_FAILURE (AcpiTbValidateTable (Table)))
- {
- Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix2-20170728/source/include/acmacros.h
-===================================================================
---- acpica-unix2-20170728.orig/source/include/acmacros.h
-+++ acpica-unix2-20170728/source/include/acmacros.h
-@@ -98,7 +98,9 @@
- ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
- ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
-
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_32_TO_8(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];}
-
- #define ACPI_MOVE_32_TO_16(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
- (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];}
-@@ -114,7 +116,9 @@
- ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
- ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
-
--/* 64-bit source, 16/32/64 destination */
-+/* 64-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_64_TO_8(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];}
-
- #define ACPI_MOVE_64_TO_16(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
- (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];}
-@@ -141,13 +145,16 @@
-
- /* The hardware supports unaligned transfers, just do the little-endian move */
-
--/* 16-bit source, 16/32/64 destination */
-+/* 16-bit source, 8/16/32/64 destination */
-
-+#define ACPI_MOVE_16_TO_8(d, s) *(UINT8 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_16(d, s) *(UINT16 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT16 *)(void *)(s)
-
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_32_TO_8(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];}
-
- #define ACPI_MOVE_32_TO_16(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
- (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
-@@ -155,8 +162,9 @@
- #define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
- #define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
-
--/* 64-bit source, 16/32/64 destination */
-+/* 64-bit source, 8/16/32/64 destination */
-
-+#define ACPI_MOVE_64_TO_8(d, s) ACPI_MOVE_16_TO_8(d, s) /* Truncate to 8 */
- #define ACPI_MOVE_64_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
- #define ACPI_MOVE_64_TO_32(d, s) ACPI_MOVE_32_TO_32(d, s) /* Truncate to 32 */
- #define ACPI_MOVE_64_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT64 *)(void *)(s)
-@@ -176,7 +184,9 @@
- #define ACPI_MOVE_16_TO_32(d, s) {(*(UINT32 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
- #define ACPI_MOVE_16_TO_64(d, s) {(*(UINT64 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
-
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_32_TO_8(d, s) ACPI_MOVE_16_TO_8(d, s) /* Truncate to 8 */
-
- #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
-
-Index: acpica-unix2-20170728/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix2-20170728.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20170728/source/include/platform/aclinux.h
-@@ -226,6 +226,10 @@
- #define __cdecl
- #endif
-
-+#if defined(__PPC64__) || defined(__s390x__)
-+#define ACPI_BIG_ENDIAN
-+#endif
-+
- #endif /* __KERNEL__ */
-
- #endif /* __ACLINUX_H__ */
-Index: acpica-unix2-20170728/source/tools/acpiexec/aetables.c
-===================================================================
---- acpica-unix2-20170728.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix2-20170728/source/tools/acpiexec/aetables.c
-@@ -146,21 +146,25 @@ AeInitializeTableHeader (
- char *Signature,
- UINT32 Length)
- {
-+ UINT16 Tmp16;
-+ UINT32 Tmp32;
-
- ACPI_MOVE_NAME (Header->Signature, Signature);
-- Header->Length = Length;
-+ ACPI_MOVE_32_TO_32(&Header->Length, &Length);
-
-- Header->OemRevision = 0x1001;
-+ Tmp16 = 0x1001;
-+ ACPI_MOVE_16_TO_16(&Header->OemRevision, &Tmp16);
- strncpy (Header->OemId, "Intel", ACPI_OEM_ID_SIZE);
- strncpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
- strncpy (Header->AslCompilerId, "INTL", ACPI_NAME_SIZE);
-- Header->AslCompilerRevision = ACPI_CA_VERSION;
-+ Tmp32 = ACPI_CA_VERSION;
-+ ACPI_MOVE_32_TO_32(&Header->AslCompilerRevision, &Tmp32);
-
- /* Set the checksum, must set to zero first */
-
- Header->Checksum = 0;
- Header->Checksum = (UINT8) -AcpiTbChecksum (
-- (void *) Header, Header->Length);
-+ (void *) Header, Length);
- }
-
-
-@@ -188,6 +192,7 @@ AeBuildLocalTables (
- ACPI_NEW_TABLE_DESC *NextTable;
- UINT32 NextIndex;
- ACPI_TABLE_FADT *ExternalFadt = NULL;
-+ UINT32 Tmp32;
-
-
- /*
-@@ -374,6 +379,8 @@ AeBuildLocalTables (
- }
- else
- {
-+ UINT64 Tmp64;
-+
- /*
- * Build a local FADT so we can test the hardware/event init
- */
-@@ -385,34 +392,44 @@ AeBuildLocalTables (
- LocalFADT.Facs = 0;
-
- LocalFADT.XDsdt = DsdtAddress;
-- LocalFADT.XFacs = ACPI_PTR_TO_PHYSADDR (&LocalFACS);
-+ Tmp64 = ACPI_PTR_TO_PHYSADDR (&LocalFACS);
-+ ACPI_MOVE_64_TO_64(&LocalFADT.XFacs, &Tmp64);
-
- /* Miscellaneous FADT fields */
-
- LocalFADT.Gpe0BlockLength = 0x08;
-- LocalFADT.Gpe0Block = 0x00001234;
-+ Tmp32 = 0x00001234;
-+ ACPI_MOVE_32_TO_32(&LocalFADT.Gpe0Block, &Tmp32);
-
- LocalFADT.Gpe1BlockLength = 0x80;
-- LocalFADT.Gpe1Block = 0x00005678;
-+ Tmp32 = 0x00005678;
-+ ACPI_MOVE_32_TO_32(&LocalFADT.Gpe1Block, &Tmp32);
- LocalFADT.Gpe1Base = 100;
-
- LocalFADT.Pm1EventLength = 4;
-- LocalFADT.Pm1aEventBlock = 0x00001aaa;
-- LocalFADT.Pm1bEventBlock = 0x00001bbb;
-+ Tmp32 = 0x00001aaa;
-+ ACPI_MOVE_32_TO_32(&LocalFADT.Pm1aEventBlock, &Tmp32);
-+ Tmp32 = 0x00001bbb;
-+ ACPI_MOVE_32_TO_32(&LocalFADT.Pm1bEventBlock, &Tmp32);
-
- LocalFADT.Pm1ControlLength = 2;
-- LocalFADT.Pm1aControlBlock = 0xB0;
-+ Tmp32 = 0xB0;
-+ ACPI_MOVE_32_TO_32(&LocalFADT.Pm1aControlBlock, &Tmp32);
-
- LocalFADT.PmTimerLength = 4;
-- LocalFADT.PmTimerBlock = 0xA0;
-+ Tmp32 = 0xA0;
-+ ACPI_MOVE_32_TO_32(&LocalFADT.PmTimerBlock, &Tmp32);
-
-- LocalFADT.Pm2ControlBlock = 0xC0;
-+ Tmp32 = 0xC0;
-+ ACPI_MOVE_32_TO_32(&LocalFADT.Pm2ControlBlock, &Tmp32);
- LocalFADT.Pm2ControlLength = 1;
-
- /* Setup one example X-64 GAS field */
-
- LocalFADT.XPm1bEventBlock.SpaceId = ACPI_ADR_SPACE_SYSTEM_IO;
-- LocalFADT.XPm1bEventBlock.Address = LocalFADT.Pm1bEventBlock;
-+ ACPI_MOVE_32_TO_32(&Tmp32, &LocalFADT.Pm1bEventBlock);
-+ Tmp64 = (UINT64)Tmp32;
-+ ACPI_MOVE_64_TO_64(&LocalFADT.XPm1bEventBlock.Address, &Tmp64);
- LocalFADT.XPm1bEventBlock.BitWidth = (UINT8)
- ACPI_MUL_8 (LocalFADT.Pm1EventLength);
- }
-@@ -425,13 +442,17 @@ AeBuildLocalTables (
- memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
- ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS);
-
-- LocalFACS.Length = sizeof (ACPI_TABLE_FACS);
-- LocalFACS.GlobalLock = 0x11AA0011;
-+ Tmp32 = sizeof (ACPI_TABLE_FACS);
-+ ACPI_MOVE_32_TO_32(&LocalFACS.Length, &Tmp32);
-+ Tmp32 = 0x11AA0011;
-+ ACPI_MOVE_32_TO_32(&LocalFACS.GlobalLock, &Tmp32);
-
- /* Build the optional local tables */
-
- if (AcpiGbl_LoadTestTables)
- {
-+ UINT32 Tmp32;
-+
- /*
- * Build a fake table [TEST] so that we make sure that the
- * ACPICA core ignores it
-@@ -440,11 +461,12 @@ AeBuildLocalTables (
- ACPI_MOVE_NAME (LocalTEST.Signature, "TEST");
-
- LocalTEST.Revision = 1;
-- LocalTEST.Length = sizeof (ACPI_TABLE_HEADER);
-+ Tmp32 = sizeof (ACPI_TABLE_HEADER);
-+ ACPI_MOVE_32_TO_32(&LocalTEST.Length, &Tmp32);
-
- LocalTEST.Checksum = 0;
- LocalTEST.Checksum = (UINT8) -AcpiTbChecksum (
-- (void *) &LocalTEST, LocalTEST.Length);
-+ (void *) &LocalTEST, Tmp32);
-
- /*
- * Build a fake table with a bad signature [BAD!] so that we make
-@@ -454,11 +476,12 @@ AeBuildLocalTables (
- ACPI_MOVE_NAME (LocalBADTABLE.Signature, "BAD!");
-
- LocalBADTABLE.Revision = 1;
-- LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER);
-+ Tmp32 = sizeof (ACPI_TABLE_HEADER);
-+ ACPI_MOVE_32_TO_32(&LocalBADTABLE.Length, &Tmp32);
-
- LocalBADTABLE.Checksum = 0;
- LocalBADTABLE.Checksum = (UINT8) -AcpiTbChecksum (
-- (void *) &LocalBADTABLE, LocalBADTABLE.Length);
-+ (void *) &LocalBADTABLE, Tmp32);
- }
-
- return (AE_OK);
commit 3c1be008357e72d46b619701cc4610a7b8889f46
Author: Al Stone <ahs3(a)redhat.com>
Date: Fri Aug 18 18:28:34 2017 -0600
Fix stupid typo in ppc64le.patch
Signed-off-by: Al Stone <ahs3(a)redhat.com>
diff --git a/ppc64le.patch b/ppc64le.patch
index af03da5..0567ee4 100644
--- a/ppc64le.patch
+++ b/ppc64le.patch
@@ -6,7 +6,7 @@ Index: acpica-unix2-20170728/source/include/platform/aclinux.h
#define __cdecl
#endif
-+#if __BYTE_ORDER__ __ORDER_BIG_ENDIAN__
++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#if defined(__PPC64__) || defined(__s390x__)
#define ACPI_BIG_ENDIAN
#endif
commit 10e64345c6f768495fcc20bfa67c1e1156b5de5d
Author: Al Stone <ahs3(a)redhat.com>
Date: Fri Aug 18 18:22:02 2017 -0600
Fix ppc64le patch to detect big-endian properly
Signed-off-by: Al Stone <ahs3(a)redhat.com>
diff --git a/ppc64le.patch b/ppc64le.patch
index d2fa669..af03da5 100644
--- a/ppc64le.patch
+++ b/ppc64le.patch
@@ -6,7 +6,7 @@ Index: acpica-unix2-20170728/source/include/platform/aclinux.h
#define __cdecl
#endif
-+#if defined(__BIG_ENDIAN)
++#if __BYTE_ORDER__ __ORDER_BIG_ENDIAN__
#if defined(__PPC64__) || defined(__s390x__)
#define ACPI_BIG_ENDIAN
#endif
commit 99f1748353feef9a07f3ae5cfd96ec73bb7e3f36
Author: Al Stone <ahs3(a)redhat.com>
Date: Fri Aug 18 17:44:43 2017 -0600
Re-enable full testing for s390x
Signed-off-by: Al Stone <ahs3(a)redhat.com>
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 292ee0e..b79ec9b 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -138,13 +138,7 @@ cd tests
[ $? -eq 0 ] || exit 1
# misc tests
-#
-# temporarily disable this test case on s390x, at least until the
-# remaining big-endian issues can be resolved; this appears to be
-# a false negative result but only on s390x
-%ifnarch s390x
./run-misc-tests.sh %{buildroot}%{_bindir} %{version}
-%endif
# Template tests
cd templates
@@ -194,6 +188,7 @@ fi
- Completed the big-endian fixes (I think)
- Fix ppc64le.patch that inadvertently broke s390x
- Minor patch refresh
+- Re-enable full %check for s390x
* Mon Aug 14 2017 Al Stone <ahs3(a)redhat.com> - 20170728-2
- Start some long delayed clean-up
commit c045b7cf37ef193f4f668ce3ca837449c702cabd
Author: Al Stone <ahs3(a)redhat.com>
Date: Fri Aug 18 17:32:28 2017 -0600
Finish up the big-endian changes, hopefully
Signed-off-by: Al Stone <ahs3(a)redhat.com>
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 915272a..292ee0e 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
Name: acpica-tools
Version: 20170728
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables
Group: Development/Languages
@@ -190,6 +190,11 @@ fi
%changelog
+* Fri Aug 18 2017 Al Stone <ahs3(a)redhat.com> - 20170728-3
+- Completed the big-endian fixes (I think)
+- Fix ppc64le.patch that inadvertently broke s390x
+- Minor patch refresh
+
* Mon Aug 14 2017 Al Stone <ahs3(a)redhat.com> - 20170728-2
- Start some long delayed clean-up
- Temporarily disable one test section until all the big-endian issues
diff --git a/big-endian.patch b/big-endian.patch
index 483448f..b0988f7 100644
--- a/big-endian.patch
+++ b/big-endian.patch
@@ -1588,7 +1588,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
===================================================================
--- acpica-unix2-20170728.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20170728/source/compiler/aslrestype2s.c
-@@ -340,6 +340,9 @@ RsDoGpioIntDescriptor (
+@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
UINT16 DescriptorSize;
@@ -1598,7 +1598,37 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
UINT32 CurrentByteOffset;
UINT32 PinCount = 0;
UINT32 i;
-@@ -396,21 +399,21 @@ RsDoGpioIntDescriptor (
++ UINT16 Tmp16;
++ UINT16 Val16;
+
+
+ InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -367,7 +372,7 @@ RsDoGpioIntDescriptor (
+ sizeof (AML_RESOURCE_LARGE_HEADER));
+
+ Descriptor = Rnode->Buffer;
+- Descriptor->Gpio.ResourceLength = DescriptorSize;
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResourceLength, &DescriptorSize);
+ Descriptor->Gpio.DescriptorType = ACPI_RESOURCE_NAME_GPIO;
+ Descriptor->Gpio.RevisionId = AML_RESOURCE_GPIO_REVISION;
+ Descriptor->Gpio.ConnectionType = AML_RESOURCE_GPIO_TYPE_INT;
+@@ -382,11 +387,11 @@ RsDoGpioIntDescriptor (
+
+ /* Setup offsets within the descriptor */
+
+- Descriptor->Gpio.PinTableOffset = (UINT16)
+- ACPI_PTR_DIFF (InterruptList, Descriptor);
++ Tmp16 = (UINT16) ACPI_PTR_DIFF (InterruptList, Descriptor);
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.PinTableOffset, &Tmp16);
+
+- Descriptor->Gpio.ResSourceOffset = (UINT16)
+- ACPI_PTR_DIFF (ResourceSource, Descriptor);
++ Tmp16 = (UINT16) ACPI_PTR_DIFF (ResourceSource, Descriptor);
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResSourceOffset, &Tmp16);
+
+ /* Process all child initialization nodes */
+
+@@ -396,21 +401,21 @@ RsDoGpioIntDescriptor (
{
case 0: /* Interrupt Mode - edge/level [Flag] (_MOD) */
@@ -1623,7 +1653,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3, 2);
break;
-@@ -424,7 +427,7 @@ RsDoGpioIntDescriptor (
+@@ -424,7 +429,7 @@ RsDoGpioIntDescriptor (
case 4: /* Debounce Timeout [WORD] (_DBT) */
@@ -1632,7 +1662,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout));
break;
-@@ -451,7 +454,7 @@ RsDoGpioIntDescriptor (
+@@ -451,7 +456,7 @@ RsDoGpioIntDescriptor (
case 7: /* Resource Usage (consumer/producer) */
@@ -1641,7 +1671,50 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
break;
case 8: /* Resource Tag (Descriptor Name) */
-@@ -516,6 +519,10 @@ RsDoGpioIntDescriptor (
+@@ -466,13 +471,14 @@ RsDoGpioIntDescriptor (
+ * This field is required in order to calculate the length
+ * of the ResourceSource at runtime.
+ */
+- Descriptor->Gpio.VendorOffset = (UINT16)
+- ACPI_PTR_DIFF (VendorData, Descriptor);
++ Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorOffset, &Tmp16);
+
+ if (RsGetVendorData (InitializerOp, VendorData,
+- (CurrentByteOffset + Descriptor->Gpio.VendorOffset)))
++ (CurrentByteOffset + Tmp16)))
+ {
+- Descriptor->Gpio.VendorLength = VendorLength;
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorLength,
++ &VendorLength);
+ }
+ break;
+
+@@ -485,7 +491,9 @@ RsDoGpioIntDescriptor (
+ * (implies resource source must immediately follow the pin list.)
+ * Name: _PIN
+ */
+- *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
++ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++ ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
++ *InterruptList = Val16;
+ InterruptList++;
+ PinCount++;
+
+@@ -507,8 +515,10 @@ RsDoGpioIntDescriptor (
+
+ /* Create a named field at the start of the list */
+
+- RsCreateWordField (InitializerOp, ACPI_RESTAG_PIN,
+- CurrentByteOffset + Descriptor->Gpio.PinTableOffset);
++ ACPI_MOVE_16_TO_16(&Tmp16, &Descriptor->Gpio.PinTableOffset);
++ Tmp16 += CurrentByteOffset;
++ ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
++ RsCreateWordField (InitializerOp, ACPI_RESTAG_PIN, Val16);
+ }
+ break;
+ }
+@@ -516,6 +526,10 @@ RsDoGpioIntDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1652,7 +1725,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
MpSaveGpioInfo (Info->MappingOp, Descriptor,
PinCount, PinList, ResourceSource);
return (Rnode);
-@@ -549,6 +556,10 @@ RsDoGpioIoDescriptor (
+@@ -549,9 +563,15 @@ RsDoGpioIoDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
UINT16 DescriptorSize;
@@ -1663,7 +1736,37 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
UINT32 CurrentByteOffset;
UINT32 PinCount = 0;
UINT32 i;
-@@ -605,7 +616,7 @@ RsDoGpioIoDescriptor (
++ UINT16 Tmp16;
++ UINT16 Val16;
+
+
+ InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -577,7 +597,7 @@ RsDoGpioIoDescriptor (
+ sizeof (AML_RESOURCE_LARGE_HEADER));
+
+ Descriptor = Rnode->Buffer;
+- Descriptor->Gpio.ResourceLength = DescriptorSize;
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResourceLength, &DescriptorSize);
+ Descriptor->Gpio.DescriptorType = ACPI_RESOURCE_NAME_GPIO;
+ Descriptor->Gpio.RevisionId = AML_RESOURCE_GPIO_REVISION;
+ Descriptor->Gpio.ConnectionType = AML_RESOURCE_GPIO_TYPE_IO;
+@@ -591,11 +611,11 @@ RsDoGpioIoDescriptor (
+
+ /* Setup offsets within the descriptor */
+
+- Descriptor->Gpio.PinTableOffset = (UINT16)
+- ACPI_PTR_DIFF (InterruptList, Descriptor);
++ Tmp16 = (UINT16) ACPI_PTR_DIFF (InterruptList, Descriptor);
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.PinTableOffset, &Tmp16);
+
+- Descriptor->Gpio.ResSourceOffset = (UINT16)
+- ACPI_PTR_DIFF (ResourceSource, Descriptor);
++ Tmp16 = (UINT16) ACPI_PTR_DIFF (ResourceSource, Descriptor);
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResSourceOffset, &Tmp16);
+
+ /* Process all child initialization nodes */
+
+@@ -605,7 +625,7 @@ RsDoGpioIoDescriptor (
{
case 0: /* Share Type [Flags] (_SHR) */
@@ -1672,7 +1775,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3);
break;
-@@ -619,21 +630,21 @@ RsDoGpioIoDescriptor (
+@@ -619,21 +639,21 @@ RsDoGpioIoDescriptor (
case 2: /* Debounce Timeout [WORD] (_DBT) */
@@ -1697,7 +1800,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_IORESTRICTION,
CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0, 2);
break;
-@@ -659,7 +670,7 @@ RsDoGpioIoDescriptor (
+@@ -659,7 +679,7 @@ RsDoGpioIoDescriptor (
case 7: /* Resource Usage (consumer/producer) */
@@ -1706,7 +1809,36 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
break;
case 8: /* Resource Tag (Descriptor Name) */
-@@ -723,6 +734,11 @@ RsDoGpioIoDescriptor (
+@@ -673,13 +693,14 @@ RsDoGpioIoDescriptor (
+ * This field is required in order to calculate the length
+ * of the ResourceSource at runtime.
+ */
+- Descriptor->Gpio.VendorOffset = (UINT16)
+- ACPI_PTR_DIFF (VendorData, Descriptor);
++ Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorOffset, &Tmp16);
+
+ if (RsGetVendorData (InitializerOp, VendorData,
+ (CurrentByteOffset + Descriptor->Gpio.VendorOffset)))
+ {
+- Descriptor->Gpio.VendorLength = VendorLength;
++ ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorLength,
++ &VendorLength);
+ }
+ break;
+
+@@ -692,7 +713,9 @@ RsDoGpioIoDescriptor (
+ * (implies resource source must immediately follow the pin list.)
+ * Name: _PIN
+ */
+- *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
++ Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++ ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
++ *InterruptList = Val16;
+ InterruptList++;
+ PinCount++;
+
+@@ -723,6 +746,11 @@ RsDoGpioIoDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1718,7 +1850,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
MpSaveGpioInfo (Info->MappingOp, Descriptor,
PinCount, PinList, ResourceSource);
return (Rnode);
-@@ -753,6 +769,9 @@ RsDoI2cSerialBusDescriptor (
+@@ -753,8 +781,12 @@ RsDoI2cSerialBusDescriptor (
UINT16 ResSourceLength;
UINT16 VendorLength;
UINT16 DescriptorSize;
@@ -1727,8 +1859,28 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
+ UINT16 TypeSpecificFlags = 0;
UINT32 CurrentByteOffset;
UINT32 i;
++ UINT16 Tmp16;
+
+
+ InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -777,12 +809,14 @@ RsDoI2cSerialBusDescriptor (
+ sizeof (AML_RESOURCE_LARGE_HEADER));
-@@ -802,7 +821,7 @@ RsDoI2cSerialBusDescriptor (
+ Descriptor = Rnode->Buffer;
+- Descriptor->I2cSerialBus.ResourceLength = DescriptorSize;
++ ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.ResourceLength,
++ &DescriptorSize);
+ Descriptor->I2cSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
+ Descriptor->I2cSerialBus.RevisionId = AML_RESOURCE_I2C_REVISION;
+ Descriptor->I2cSerialBus.TypeRevisionId = AML_RESOURCE_I2C_TYPE_REVISION;
+ Descriptor->I2cSerialBus.Type = AML_RESOURCE_I2C_SERIALBUSTYPE;
+- Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
++ Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
++ ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.TypeDataLength, &Tmp16);
+
+ if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
+ {
+@@ -802,7 +836,7 @@ RsDoI2cSerialBusDescriptor (
{
case 0: /* Slave Address [WORD] (_ADR) */
@@ -1737,7 +1889,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
break;
-@@ -816,14 +835,14 @@ RsDoI2cSerialBusDescriptor (
+@@ -816,14 +850,14 @@ RsDoI2cSerialBusDescriptor (
case 2: /* Connection Speed [DWORD] (_SPE) */
@@ -1754,7 +1906,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
break;
-@@ -883,6 +902,9 @@ RsDoI2cSerialBusDescriptor (
+@@ -883,6 +917,9 @@ RsDoI2cSerialBusDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1764,7 +1916,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
-@@ -912,6 +934,9 @@ RsDoSpiSerialBusDescriptor (
+@@ -912,6 +949,9 @@ RsDoSpiSerialBusDescriptor (
UINT16 ResSourceLength;
UINT16 VendorLength;
UINT16 DescriptorSize;
@@ -1774,7 +1926,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
UINT32 CurrentByteOffset;
UINT32 i;
-@@ -962,21 +987,21 @@ RsDoSpiSerialBusDescriptor (
+@@ -962,21 +1002,21 @@ RsDoSpiSerialBusDescriptor (
{
case 0: /* Device Selection [WORD] (_ADR) */
@@ -1799,7 +1951,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
break;
-@@ -997,7 +1022,7 @@ RsDoSpiSerialBusDescriptor (
+@@ -997,7 +1037,7 @@ RsDoSpiSerialBusDescriptor (
case 5: /* Connection Speed [DWORD] (_SPE) */
@@ -1808,7 +1960,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
break;
-@@ -1071,6 +1096,10 @@ RsDoSpiSerialBusDescriptor (
+@@ -1071,6 +1111,10 @@ RsDoSpiSerialBusDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1819,7 +1971,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
-@@ -1100,6 +1129,10 @@ RsDoUartSerialBusDescriptor (
+@@ -1100,6 +1144,10 @@ RsDoUartSerialBusDescriptor (
UINT16 ResSourceLength;
UINT16 VendorLength;
UINT16 DescriptorSize;
@@ -1830,7 +1982,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
UINT32 CurrentByteOffset;
UINT32 i;
-@@ -1149,21 +1182,21 @@ RsDoUartSerialBusDescriptor (
+@@ -1149,21 +1197,21 @@ RsDoUartSerialBusDescriptor (
{
case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
@@ -1855,7 +2007,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
break;
-@@ -1177,7 +1210,7 @@ RsDoUartSerialBusDescriptor (
+@@ -1177,7 +1225,7 @@ RsDoUartSerialBusDescriptor (
case 4: /* Endianness [Flag] (_END) */
@@ -1864,7 +2016,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
break;
-@@ -1191,21 +1224,21 @@ RsDoUartSerialBusDescriptor (
+@@ -1191,21 +1239,21 @@ RsDoUartSerialBusDescriptor (
case 6: /* Flow Control [Flags] (_FLC) */
@@ -1889,7 +2041,7 @@ Index: acpica-unix2-20170728/source/compiler/aslrestype2s.c
RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
break;
-@@ -1275,6 +1308,11 @@ RsDoUartSerialBusDescriptor (
+@@ -1275,6 +1323,11 @@ RsDoUartSerialBusDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -2724,7 +2876,115 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Offset += sizeof (UINT64);
}
}
-@@ -524,17 +532,21 @@ AcpiDmDumpAsf (
+@@ -358,12 +366,12 @@ AcpiDmDumpFadt (
+ ACPI_TABLE_HEADER *Table)
+ {
+ ACPI_STATUS Status;
+-
++ UINT32 Length;
+
+ /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
+
+- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+- AcpiDmTableInfoFadt1);
++ ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt1);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+@@ -371,11 +379,9 @@ AcpiDmDumpFadt (
+
+ /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
+
+- if ((Table->Length > ACPI_FADT_V1_SIZE) &&
+- (Table->Length <= ACPI_FADT_V2_SIZE))
++ if ((Length > ACPI_FADT_V1_SIZE) && (Length <= ACPI_FADT_V2_SIZE))
+ {
+- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+- AcpiDmTableInfoFadt2);
++ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt2);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+@@ -384,10 +390,9 @@ AcpiDmDumpFadt (
+
+ /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
+
+- else if (Table->Length > ACPI_FADT_V2_SIZE)
++ else if (Length > ACPI_FADT_V2_SIZE)
+ {
+- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+- AcpiDmTableInfoFadt3);
++ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt3);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+@@ -395,9 +400,9 @@ AcpiDmDumpFadt (
+
+ /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
+
+- if (Table->Length > ACPI_FADT_V3_SIZE)
++ if (Length > ACPI_FADT_V3_SIZE)
+ {
+- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++ Status = AcpiDmDumpTable (Length, 0, Table, 0,
+ AcpiDmTableInfoFadt5);
+ if (ACPI_FAILURE (Status))
+ {
+@@ -407,9 +412,9 @@ AcpiDmDumpFadt (
+
+ /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
+
+- if (Table->Length > ACPI_FADT_V3_SIZE)
++ if (Length > ACPI_FADT_V3_SIZE)
+ {
+- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++ Status = AcpiDmDumpTable (Length, 0, Table, 0,
+ AcpiDmTableInfoFadt6);
+ if (ACPI_FAILURE (Status))
+ {
+@@ -420,11 +425,11 @@ AcpiDmDumpFadt (
+
+ /* Validate various fields in the FADT, including length */
+
+- AcpiTbCreateLocalFadt (Table, Table->Length);
++ AcpiTbCreateLocalFadt (Table, Length);
+
+ /* Validate FADT length against the revision */
+
+- AcpiDmValidateFadtLength (Table->Revision, Table->Length);
++ AcpiDmValidateFadtLength (Table->Revision, Length);
+ }
+
+
+@@ -450,6 +455,7 @@ AcpiDmValidateFadtLength (
+ UINT32 Length)
+ {
+ UINT32 ExpectedLength;
++ UINT32 Tmp32;
+
+
+ switch (Revision)
+@@ -485,7 +491,8 @@ AcpiDmValidateFadtLength (
+ return;
+ }
+
+- if (Length == ExpectedLength)
++ ACPI_MOVE_32_TO_32(&Tmp32, &Length);
++ if (Tmp32 == ExpectedLength)
+ {
+ return;
+ }
+@@ -493,7 +500,7 @@ AcpiDmValidateFadtLength (
+ AcpiOsPrintf (
+ "\n// ACPI Warning: FADT revision %X does not match length: "
+ "found %X expected %X\n",
+- Revision, Length, ExpectedLength);
++ Revision, Tmp32, ExpectedLength);
+ }
+
+
+@@ -524,17 +531,21 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0;
UINT32 i;
UINT8 Type;
@@ -2749,7 +3009,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -591,8 +603,7 @@ AcpiDmDumpAsf (
+@@ -591,8 +602,7 @@ AcpiDmDumpAsf (
return;
}
@@ -2759,7 +3019,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -608,7 +619,7 @@ AcpiDmDumpAsf (
+@@ -608,7 +618,7 @@ AcpiDmDumpAsf (
for (i = 0; i < DataCount; i++)
{
AcpiOsPrintf ("\n");
@@ -2768,7 +3028,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
DataTable, DataLength, DataInfoTable);
if (ACPI_FAILURE (Status))
{
-@@ -654,15 +665,14 @@ AcpiDmDumpAsf (
+@@ -654,15 +664,14 @@ AcpiDmDumpAsf (
/* Point to next subtable */
@@ -2787,7 +3047,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -686,12 +696,13 @@ AcpiDmDumpCpep (
+@@ -686,12 +695,13 @@ AcpiDmDumpCpep (
{
ACPI_STATUS Status;
ACPI_CPEP_POLLING *SubTable;
@@ -2802,7 +3062,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep);
if (ACPI_FAILURE (Status))
{
-@@ -701,7 +712,7 @@ AcpiDmDumpCpep (
+@@ -701,7 +711,7 @@ AcpiDmDumpCpep (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
@@ -2811,7 +3071,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset, SubTable,
-@@ -741,7 +752,10 @@ AcpiDmDumpCsrt (
+@@ -741,7 +751,10 @@ AcpiDmDumpCsrt (
ACPI_CSRT_GROUP *SubTable;
ACPI_CSRT_SHARED_INFO *SharedInfoTable;
ACPI_CSRT_DESCRIPTOR *SubSubTable;
@@ -2823,7 +3083,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
UINT32 Offset = sizeof (ACPI_TABLE_CSRT);
UINT32 SubOffset;
UINT32 SubSubOffset;
-@@ -752,14 +766,16 @@ AcpiDmDumpCsrt (
+@@ -752,14 +765,16 @@ AcpiDmDumpCsrt (
/* Subtables (Resource Groups) */
@@ -2842,7 +3102,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -779,19 +795,20 @@ AcpiDmDumpCsrt (
+@@ -779,19 +794,20 @@ AcpiDmDumpCsrt (
return;
}
@@ -2867,7 +3127,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -801,7 +818,7 @@ AcpiDmDumpCsrt (
+@@ -801,7 +817,7 @@ AcpiDmDumpCsrt (
/* Resource-specific info buffer */
@@ -2876,7 +3136,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (InfoLength)
{
Status = AcpiDmDumpTable (Length,
-@@ -816,16 +833,15 @@ AcpiDmDumpCsrt (
+@@ -816,16 +832,15 @@ AcpiDmDumpCsrt (
/* Point to next sub-subtable */
@@ -2897,7 +3157,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -849,16 +865,20 @@ AcpiDmDumpDbg2 (
+@@ -849,16 +864,20 @@ AcpiDmDumpDbg2 (
{
ACPI_STATUS Status;
ACPI_DBG2_DEVICE *SubTable;
@@ -2919,7 +3179,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2);
if (ACPI_FAILURE (Status))
{
-@@ -868,11 +888,12 @@ AcpiDmDumpDbg2 (
+@@ -868,11 +887,12 @@ AcpiDmDumpDbg2 (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
@@ -2934,7 +3194,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -882,13 +903,13 @@ AcpiDmDumpDbg2 (
+@@ -882,13 +902,13 @@ AcpiDmDumpDbg2 (
for (i = 0; i < SubTable->RegisterCount; i++)
{
@@ -2951,7 +3211,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -899,13 +920,13 @@ AcpiDmDumpDbg2 (
+@@ -899,13 +919,13 @@ AcpiDmDumpDbg2 (
for (i = 0; i < SubTable->RegisterCount; i++)
{
@@ -2968,7 +3228,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -915,12 +936,13 @@ AcpiDmDumpDbg2 (
+@@ -915,12 +935,13 @@ AcpiDmDumpDbg2 (
/* Dump the Namestring (required) */
AcpiOsPrintf ("\n");
@@ -2984,7 +3244,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -930,9 +952,10 @@ AcpiDmDumpDbg2 (
+@@ -930,9 +951,10 @@ AcpiDmDumpDbg2 (
if (SubTable->OemDataOffset)
{
@@ -2998,7 +3258,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -941,9 +964,9 @@ AcpiDmDumpDbg2 (
+@@ -941,9 +963,9 @@ AcpiDmDumpDbg2 (
/* Point to next subtable */
@@ -3010,7 +3270,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -967,17 +990,20 @@ AcpiDmDumpDmar (
+@@ -967,17 +989,20 @@ AcpiDmDumpDmar (
{
ACPI_STATUS Status;
ACPI_DMAR_HEADER *SubTable;
@@ -3032,7 +3292,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar);
if (ACPI_FAILURE (Status))
{
-@@ -987,13 +1013,14 @@ AcpiDmDumpDmar (
+@@ -987,13 +1012,14 @@ AcpiDmDumpDmar (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
@@ -3049,7 +3309,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -1001,7 +1028,8 @@ AcpiDmDumpDmar (
+@@ -1001,7 +1027,8 @@ AcpiDmDumpDmar (
AcpiOsPrintf ("\n");
@@ -3059,7 +3319,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
case ACPI_DMAR_TYPE_HARDWARE_UNIT:
-@@ -1036,12 +1064,12 @@ AcpiDmDumpDmar (
+@@ -1036,12 +1063,12 @@ AcpiDmDumpDmar (
default:
AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
@@ -3074,7 +3334,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -1050,8 +1078,8 @@ AcpiDmDumpDmar (
+@@ -1050,8 +1077,8 @@ AcpiDmDumpDmar (
/*
* Dump the optional device scope entries
*/
@@ -3085,7 +3345,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
/* These types do not support device scopes */
-@@ -1059,7 +1087,7 @@ AcpiDmDumpDmar (
+@@ -1059,7 +1086,7 @@ AcpiDmDumpDmar (
}
ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, SubTable, ScopeOffset);
@@ -3094,7 +3354,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -1100,9 +1128,8 @@ AcpiDmDumpDmar (
+@@ -1100,9 +1127,8 @@ AcpiDmDumpDmar (
NextSubtable:
/* Point to next subtable */
@@ -3106,7 +3366,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -1129,12 +1156,15 @@ AcpiDmDumpDrtm (
+@@ -1129,12 +1155,15 @@ AcpiDmDumpDrtm (
ACPI_DRTM_RESOURCE_LIST *DrtmRl;
ACPI_DRTM_DPS_ID *DrtmDps;
UINT32 Count;
@@ -3124,7 +3384,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -1148,7 +1178,7 @@ AcpiDmDumpDrtm (
+@@ -1148,7 +1177,7 @@ AcpiDmDumpDrtm (
DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
AcpiOsPrintf ("\n");
@@ -3133,7 +3393,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
AcpiDmTableInfoDrtm0);
if (ACPI_FAILURE (Status))
-@@ -1161,10 +1191,11 @@ AcpiDmDumpDrtm (
+@@ -1161,10 +1190,11 @@ AcpiDmDumpDrtm (
/* Dump Validated table addresses */
Count = 0;
@@ -3148,7 +3408,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
AcpiDmTableInfoDrtm0a);
if (ACPI_FAILURE (Status))
-@@ -1180,7 +1211,7 @@ AcpiDmDumpDrtm (
+@@ -1180,7 +1210,7 @@ AcpiDmDumpDrtm (
DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
AcpiOsPrintf ("\n");
@@ -3157,7 +3417,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
AcpiDmTableInfoDrtm1);
if (ACPI_FAILURE (Status))
-@@ -1193,10 +1224,11 @@ AcpiDmDumpDrtm (
+@@ -1193,10 +1223,11 @@ AcpiDmDumpDrtm (
/* Dump the Resource List */
Count = 0;
@@ -3172,7 +3432,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (void, Table, Offset),
sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
if (ACPI_FAILURE (Status))
-@@ -1212,7 +1244,7 @@ AcpiDmDumpDrtm (
+@@ -1212,7 +1243,7 @@ AcpiDmDumpDrtm (
DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
AcpiOsPrintf ("\n");
@@ -3181,7 +3441,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
}
-@@ -1236,12 +1268,13 @@ AcpiDmDumpEinj (
+@@ -1236,12 +1267,13 @@ AcpiDmDumpEinj (
{
ACPI_STATUS Status;
ACPI_WHEA_HEADER *SubTable;
@@ -3196,7 +3456,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj);
if (ACPI_FAILURE (Status))
{
-@@ -1251,7 +1284,7 @@ AcpiDmDumpEinj (
+@@ -1251,7 +1283,7 @@ AcpiDmDumpEinj (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
@@ -3205,7 +3465,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset, SubTable,
-@@ -1289,12 +1322,13 @@ AcpiDmDumpErst (
+@@ -1289,12 +1321,13 @@ AcpiDmDumpErst (
{
ACPI_STATUS Status;
ACPI_WHEA_HEADER *SubTable;
@@ -3220,7 +3480,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst);
if (ACPI_FAILURE (Status))
{
-@@ -1304,7 +1338,7 @@ AcpiDmDumpErst (
+@@ -1304,7 +1337,7 @@ AcpiDmDumpErst (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
@@ -3229,7 +3489,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset, SubTable,
-@@ -1342,17 +1376,19 @@ AcpiDmDumpFpdt (
+@@ -1342,17 +1375,19 @@ AcpiDmDumpFpdt (
{
ACPI_STATUS Status;
ACPI_FPDT_HEADER *SubTable;
@@ -3251,7 +3511,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
/* Common subtable header */
-@@ -1364,7 +1400,8 @@ AcpiDmDumpFpdt (
+@@ -1364,7 +1399,8 @@ AcpiDmDumpFpdt (
return;
}
@@ -3261,7 +3521,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
case ACPI_FPDT_TYPE_BOOT:
-@@ -1378,8 +1415,7 @@ AcpiDmDumpFpdt (
+@@ -1378,8 +1414,7 @@ AcpiDmDumpFpdt (
default:
@@ -3271,7 +3531,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
/* Attempt to continue */
-@@ -1427,16 +1463,19 @@ AcpiDmDumpGtdt (
+@@ -1427,16 +1462,19 @@ AcpiDmDumpGtdt (
{
ACPI_STATUS Status;
ACPI_GTDT_HEADER *SubTable;
@@ -3292,7 +3552,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt);
if (ACPI_FAILURE (Status))
{
-@@ -1446,7 +1485,7 @@ AcpiDmDumpGtdt (
+@@ -1446,7 +1484,7 @@ AcpiDmDumpGtdt (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset);
@@ -3301,7 +3561,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
/* Common subtable header */
-@@ -1464,8 +1503,9 @@ AcpiDmDumpGtdt (
+@@ -1464,8 +1502,9 @@ AcpiDmDumpGtdt (
case ACPI_GTDT_TYPE_TIMER_BLOCK:
SubTableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
@@ -3312,7 +3572,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
InfoTable = AcpiDmTableInfoGtdt0;
break;
-@@ -1486,8 +1526,9 @@ AcpiDmDumpGtdt (
+@@ -1486,8 +1525,9 @@ AcpiDmDumpGtdt (
return;
}
@@ -3323,7 +3583,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -1546,16 +1587,18 @@ AcpiDmDumpHest (
+@@ -1546,16 +1586,18 @@ AcpiDmDumpHest (
{
ACPI_STATUS Status;
ACPI_HEST_HEADER *SubTable;
@@ -3343,7 +3603,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHest);
if (ACPI_FAILURE (Status))
{
-@@ -1565,10 +1608,11 @@ AcpiDmDumpHest (
+@@ -1565,10 +1607,11 @@ AcpiDmDumpHest (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
@@ -3357,7 +3617,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
case ACPI_HEST_TYPE_IA32_CHECK:
-@@ -1902,15 +1946,21 @@ AcpiDmDumpIort (
+@@ -1902,15 +1945,21 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset;
UINT32 NodeOffset;
@@ -3381,7 +3641,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -1921,18 +1971,19 @@ AcpiDmDumpIort (
+@@ -1921,18 +1970,19 @@ AcpiDmDumpIort (
/* Dump the OptionalPadding (optional) */
@@ -3406,7 +3666,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
/* Common subtable header */
-@@ -1968,7 +2019,8 @@ AcpiDmDumpIort (
+@@ -1968,7 +2018,8 @@ AcpiDmDumpIort (
case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
InfoTable = AcpiDmTableInfoIort2;
@@ -3416,7 +3676,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
break;
case ACPI_IORT_NODE_SMMU:
-@@ -1981,7 +2033,8 @@ AcpiDmDumpIort (
+@@ -1981,7 +2032,8 @@ AcpiDmDumpIort (
case ACPI_IORT_NODE_SMMU_V3:
InfoTable = AcpiDmTableInfoIort4;
@@ -3426,7 +3686,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
break;
default:
-@@ -1991,7 +2044,8 @@ AcpiDmDumpIort (
+@@ -1991,7 +2043,8 @@ AcpiDmDumpIort (
/* Attempt to continue */
@@ -3436,7 +3696,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("Invalid zero length IORT node\n");
return;
-@@ -2002,7 +2056,7 @@ AcpiDmDumpIort (
+@@ -2002,7 +2055,7 @@ AcpiDmDumpIort (
/* Dump the node subtable header */
AcpiOsPrintf ("\n");
@@ -3445,7 +3705,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
Length, InfoTable);
if (ACPI_FAILURE (Status))
-@@ -2022,9 +2076,10 @@ AcpiDmDumpIort (
+@@ -2022,9 +2075,10 @@ AcpiDmDumpIort (
if (IortItsGroup)
{
@@ -3458,7 +3718,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
4, AcpiDmTableInfoIort0a);
NodeOffset += 4;
-@@ -2036,11 +2091,11 @@ AcpiDmDumpIort (
+@@ -2036,11 +2090,11 @@ AcpiDmDumpIort (
/* Dump the Padding (optional) */
@@ -3474,7 +3734,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2057,8 +2112,8 @@ AcpiDmDumpIort (
+@@ -2057,8 +2111,8 @@ AcpiDmDumpIort (
if (IortSmmu)
{
Length = 2 * sizeof (UINT64);
@@ -3485,7 +3745,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
Length, AcpiDmTableInfoIort3a);
if (ACPI_FAILURE (Status))
-@@ -2066,10 +2121,11 @@ AcpiDmDumpIort (
+@@ -2066,10 +2120,11 @@ AcpiDmDumpIort (
return;
}
@@ -3500,7 +3760,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
8, AcpiDmTableInfoIort3b);
if (ACPI_FAILURE (Status))
-@@ -2080,10 +2136,11 @@ AcpiDmDumpIort (
+@@ -2080,10 +2135,11 @@ AcpiDmDumpIort (
NodeOffset += 8;
}
@@ -3515,7 +3775,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
8, AcpiDmTableInfoIort3c);
if (ACPI_FAILURE (Status))
-@@ -2103,12 +2160,13 @@ AcpiDmDumpIort (
+@@ -2103,12 +2159,13 @@ AcpiDmDumpIort (
/* Dump the ID mappings */
@@ -3532,7 +3792,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
Length, AcpiDmTableInfoIortMap);
if (ACPI_FAILURE (Status))
-@@ -2122,8 +2180,9 @@ AcpiDmDumpIort (
+@@ -2122,8 +2179,9 @@ AcpiDmDumpIort (
NextSubTable:
/* Point to next node subtable */
@@ -3544,7 +3804,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -2154,11 +2213,14 @@ AcpiDmDumpIvrs (
+@@ -2154,11 +2212,14 @@ AcpiDmDumpIvrs (
ACPI_IVRS_DE_HEADER *DeviceEntry;
ACPI_IVRS_HEADER *SubTable;
ACPI_DMTABLE_INFO *InfoTable;
@@ -3560,7 +3820,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2167,13 +2229,14 @@ AcpiDmDumpIvrs (
+@@ -2167,13 +2228,14 @@ AcpiDmDumpIvrs (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
@@ -3578,7 +3838,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2200,7 +2263,7 @@ AcpiDmDumpIvrs (
+@@ -2200,7 +2262,7 @@ AcpiDmDumpIvrs (
/* Attempt to continue */
@@ -3587,7 +3847,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return;
-@@ -2211,8 +2274,8 @@ AcpiDmDumpIvrs (
+@@ -2211,8 +2273,8 @@ AcpiDmDumpIvrs (
/* Dump the subtable */
AcpiOsPrintf ("\n");
@@ -3598,7 +3858,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2226,7 +2289,7 @@ AcpiDmDumpIvrs (
+@@ -2226,7 +2288,7 @@ AcpiDmDumpIvrs (
DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, SubTable,
sizeof (ACPI_IVRS_HARDWARE));
@@ -3607,7 +3867,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("\n");
/*
-@@ -2288,7 +2351,7 @@ AcpiDmDumpIvrs (
+@@ -2288,7 +2350,7 @@ AcpiDmDumpIvrs (
/* Dump the Device Entry */
@@ -3616,7 +3876,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
DeviceEntry, EntryLength, InfoTable);
if (ACPI_FAILURE (Status))
{
-@@ -2304,8 +2367,8 @@ AcpiDmDumpIvrs (
+@@ -2304,8 +2366,8 @@ AcpiDmDumpIvrs (
NextSubTable:
/* Point to next subtable */
@@ -3627,7 +3887,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -2331,7 +2394,7 @@ AcpiDmDumpLpit (
+@@ -2331,7 +2393,7 @@ AcpiDmDumpLpit (
{
ACPI_STATUS Status;
ACPI_LPIT_HEADER *SubTable;
@@ -3636,7 +3896,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
UINT32 Offset = sizeof (ACPI_TABLE_LPIT);
ACPI_DMTABLE_INFO *InfoTable;
UINT32 SubTableLength;
-@@ -2339,8 +2402,9 @@ AcpiDmDumpLpit (
+@@ -2339,8 +2401,9 @@ AcpiDmDumpLpit (
/* Subtables */
@@ -3647,7 +3907,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
/* Common subtable header */
-@@ -2404,13 +2468,14 @@ AcpiDmDumpMadt (
+@@ -2404,13 +2467,14 @@ AcpiDmDumpMadt (
{
ACPI_STATUS Status;
ACPI_SUBTABLE_HEADER *SubTable;
@@ -3663,7 +3923,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
if (ACPI_FAILURE (Status))
{
-@@ -2420,7 +2485,7 @@ AcpiDmDumpMadt (
+@@ -2420,7 +2484,7 @@ AcpiDmDumpMadt (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@@ -3672,7 +3932,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
/* Common subtable header */
-@@ -2566,11 +2631,13 @@ AcpiDmDumpMcfg (
+@@ -2566,11 +2630,13 @@ AcpiDmDumpMcfg (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MCFG);
ACPI_MCFG_ALLOCATION *SubTable;
@@ -3687,7 +3947,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2579,17 +2646,17 @@ AcpiDmDumpMcfg (
+@@ -2579,17 +2645,17 @@ AcpiDmDumpMcfg (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
@@ -3709,7 +3969,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
if (ACPI_FAILURE (Status))
{
-@@ -2623,6 +2690,7 @@ AcpiDmDumpMpst (
+@@ -2623,6 +2689,7 @@ AcpiDmDumpMpst (
{
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MPST);
@@ -3717,7 +3977,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
ACPI_MPST_POWER_NODE *SubTable0;
ACPI_MPST_POWER_STATE *SubTable0A;
ACPI_MPST_COMPONENT *SubTable0B;
-@@ -2631,11 +2699,13 @@ AcpiDmDumpMpst (
+@@ -2631,11 +2698,13 @@ AcpiDmDumpMpst (
UINT16 SubtableCount;
UINT32 PowerStateCount;
UINT32 ComponentCount;
@@ -3732,7 +3992,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2643,13 +2713,14 @@ AcpiDmDumpMpst (
+@@ -2643,13 +2712,14 @@ AcpiDmDumpMpst (
/* Subtable: Memory Power Node(s) */
@@ -3750,7 +4010,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
if (ACPI_FAILURE (Status))
{
-@@ -2658,8 +2729,8 @@ AcpiDmDumpMpst (
+@@ -2658,8 +2728,8 @@ AcpiDmDumpMpst (
/* Extract the sub-subtable counts */
@@ -3761,7 +4021,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Offset += sizeof (ACPI_MPST_POWER_NODE);
/* Sub-subtables - Memory Power State Structure(s) */
-@@ -2670,7 +2741,7 @@ AcpiDmDumpMpst (
+@@ -2670,7 +2740,7 @@ AcpiDmDumpMpst (
while (PowerStateCount)
{
AcpiOsPrintf ("\n");
@@ -3770,7 +4030,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
if (ACPI_FAILURE (Status))
{
-@@ -2680,7 +2751,7 @@ AcpiDmDumpMpst (
+@@ -2680,7 +2750,7 @@ AcpiDmDumpMpst (
SubTable0A++;
PowerStateCount--;
Offset += sizeof (ACPI_MPST_POWER_STATE);
@@ -3779,7 +4039,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
/* Sub-subtables - Physical Component ID Structure(s) */
-@@ -2693,7 +2764,7 @@ AcpiDmDumpMpst (
+@@ -2693,7 +2763,7 @@ AcpiDmDumpMpst (
while (ComponentCount)
{
@@ -3788,7 +4048,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
if (ACPI_FAILURE (Status))
{
-@@ -2708,17 +2779,19 @@ AcpiDmDumpMpst (
+@@ -2708,17 +2778,19 @@ AcpiDmDumpMpst (
/* Point to next Memory Power Node subtable */
SubtableCount--;
@@ -3811,7 +4071,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
if (ACPI_FAILURE (Status))
{
-@@ -2733,10 +2806,10 @@ AcpiDmDumpMpst (
+@@ -2733,10 +2805,10 @@ AcpiDmDumpMpst (
SubTable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, SubTable1,
sizeof (ACPI_MPST_DATA_HDR));
@@ -3824,7 +4084,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
if (ACPI_FAILURE (Status))
{
-@@ -2769,11 +2842,13 @@ AcpiDmDumpMsct (
+@@ -2769,11 +2841,13 @@ AcpiDmDumpMsct (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MSCT);
ACPI_MSCT_PROXIMITY *SubTable;
@@ -3839,7 +4099,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2782,12 +2857,12 @@ AcpiDmDumpMsct (
+@@ -2782,12 +2856,12 @@ AcpiDmDumpMsct (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
@@ -3854,7 +4114,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
if (ACPI_FAILURE (Status))
{
-@@ -2822,11 +2897,13 @@ AcpiDmDumpMtmr (
+@@ -2822,11 +2896,13 @@ AcpiDmDumpMtmr (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MTMR);
ACPI_MTMR_ENTRY *SubTable;
@@ -3869,7 +4129,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2835,12 +2912,12 @@ AcpiDmDumpMtmr (
+@@ -2835,12 +2911,12 @@ AcpiDmDumpMtmr (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@@ -3884,7 +4144,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
if (ACPI_FAILURE (Status))
{
-@@ -2882,11 +2959,17 @@ AcpiDmDumpNfit (
+@@ -2882,11 +2958,17 @@ AcpiDmDumpNfit (
ACPI_NFIT_SMBIOS *SmbiosInfo = NULL;
ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
UINT32 i;
@@ -3903,7 +4163,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2895,19 +2978,21 @@ AcpiDmDumpNfit (
+@@ -2895,19 +2977,21 @@ AcpiDmDumpNfit (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@@ -3929,7 +4189,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
-@@ -2959,7 +3044,7 @@ AcpiDmDumpNfit (
+@@ -2959,7 +3043,7 @@ AcpiDmDumpNfit (
/* Attempt to continue */
@@ -3938,7 +4198,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf ("Invalid zero length subtable\n");
return;
-@@ -2968,8 +3053,8 @@ AcpiDmDumpNfit (
+@@ -2968,8 +3052,8 @@ AcpiDmDumpNfit (
}
AcpiOsPrintf ("\n");
@@ -3949,7 +4209,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -2977,13 +3062,14 @@ AcpiDmDumpNfit (
+@@ -2977,13 +3061,14 @@ AcpiDmDumpNfit (
/* Per-subtable variable-length fields */
@@ -3967,7 +4227,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
&Interleave->LineOffset[i],
sizeof (UINT32), AcpiDmTableInfoNfit2a);
if (ACPI_FAILURE (Status))
-@@ -2997,12 +3083,11 @@ AcpiDmDumpNfit (
+@@ -2997,12 +3082,11 @@ AcpiDmDumpNfit (
case ACPI_NFIT_TYPE_SMBIOS:
@@ -3982,7 +4242,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
SmbiosInfo,
Length, AcpiDmTableInfoNfit3a);
-@@ -3016,9 +3101,10 @@ AcpiDmDumpNfit (
+@@ -3016,9 +3100,10 @@ AcpiDmDumpNfit (
case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
@@ -3995,7 +4255,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
&Hint->HintAddress[i],
sizeof (UINT64), AcpiDmTableInfoNfit6a);
if (ACPI_FAILURE (Status))
-@@ -3037,8 +3123,8 @@ AcpiDmDumpNfit (
+@@ -3037,8 +3122,8 @@ AcpiDmDumpNfit (
NextSubTable:
/* Point to next subtable */
@@ -4006,7 +4266,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -3063,12 +3149,13 @@ AcpiDmDumpPcct (
+@@ -3063,12 +3148,13 @@ AcpiDmDumpPcct (
ACPI_STATUS Status;
ACPI_PCCT_SUBSPACE *SubTable;
ACPI_DMTABLE_INFO *InfoTable;
@@ -4021,7 +4281,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
if (ACPI_FAILURE (Status))
{
-@@ -3078,7 +3165,7 @@ AcpiDmDumpPcct (
+@@ -3078,7 +3164,7 @@ AcpiDmDumpPcct (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -4030,7 +4290,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
/* Common subtable header */
-@@ -3164,16 +3251,21 @@ AcpiDmDumpPmtt (
+@@ -3164,16 +3250,21 @@ AcpiDmDumpPmtt (
ACPI_PMTT_HEADER *MemSubTable;
ACPI_PMTT_HEADER *DimmSubTable;
ACPI_PMTT_DOMAIN *DomainArray;
@@ -4054,7 +4314,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
if (ACPI_FAILURE (Status))
{
-@@ -3183,13 +3275,14 @@ AcpiDmDumpPmtt (
+@@ -3183,13 +3274,14 @@ AcpiDmDumpPmtt (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@@ -4071,7 +4331,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3208,7 +3301,7 @@ AcpiDmDumpPmtt (
+@@ -3208,7 +3300,7 @@ AcpiDmDumpPmtt (
/* Dump the fixed-length portion of the subtable */
Status = AcpiDmDumpTable (Length, Offset, SubTable,
@@ -4080,7 +4340,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3220,15 +3313,16 @@ AcpiDmDumpPmtt (
+@@ -3220,15 +3312,16 @@ AcpiDmDumpPmtt (
MemSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, SubTable,
sizeof (ACPI_PMTT_SOCKET));
@@ -4100,7 +4360,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3248,7 +3342,7 @@ AcpiDmDumpPmtt (
+@@ -3248,7 +3341,7 @@ AcpiDmDumpPmtt (
Status = AcpiDmDumpTable (Length,
Offset + MemOffset, MemSubTable,
@@ -4109,7 +4369,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3256,13 +3350,14 @@ AcpiDmDumpPmtt (
+@@ -3256,13 +3349,14 @@ AcpiDmDumpPmtt (
/* Walk the variable count of proximity domains */
@@ -4127,7 +4387,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
DomainCount)
{
Status = AcpiDmDumpTable (Length,
-@@ -3290,15 +3385,16 @@ AcpiDmDumpPmtt (
+@@ -3290,15 +3384,16 @@ AcpiDmDumpPmtt (
DimmSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubTable,
DomainOffset);
@@ -4147,7 +4407,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3318,7 +3414,7 @@ AcpiDmDumpPmtt (
+@@ -3318,7 +3413,7 @@ AcpiDmDumpPmtt (
Status = AcpiDmDumpTable (Length,
Offset + MemOffset + DimmOffset, DimmSubTable,
@@ -4156,7 +4416,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3326,23 +3422,22 @@ AcpiDmDumpPmtt (
+@@ -3326,23 +3421,22 @@ AcpiDmDumpPmtt (
/* Point to next DIMM subtable */
@@ -4186,7 +4446,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
}
-@@ -3498,6 +3593,8 @@ AcpiDmDumpS3pt (
+@@ -3498,6 +3592,8 @@ AcpiDmDumpS3pt (
ACPI_FPDT_HEADER *SubTable;
ACPI_DMTABLE_INFO *InfoTable;
ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -4195,7 +4455,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
/* Main table */
-@@ -3508,20 +3605,22 @@ AcpiDmDumpS3pt (
+@@ -3508,20 +3604,22 @@ AcpiDmDumpS3pt (
return 0;
}
@@ -4221,7 +4481,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
case ACPI_S3PT_TYPE_RESUME:
-@@ -3536,7 +3635,7 @@ AcpiDmDumpS3pt (
+@@ -3536,7 +3634,7 @@ AcpiDmDumpS3pt (
default:
AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -4230,7 +4490,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
/* Attempt to continue */
-@@ -3549,7 +3648,7 @@ AcpiDmDumpS3pt (
+@@ -3549,7 +3647,7 @@ AcpiDmDumpS3pt (
}
AcpiOsPrintf ("\n");
@@ -4239,7 +4499,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
SubTable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
-@@ -3583,9 +3682,11 @@ void
+@@ -3583,9 +3681,11 @@ void
AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table)
{
@@ -4253,7 +4513,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
}
-@@ -3608,14 +3709,17 @@ AcpiDmDumpSlit (
+@@ -3608,14 +3708,17 @@ AcpiDmDumpSlit (
ACPI_STATUS Status;
UINT32 Offset;
UINT8 *Row;
@@ -4273,7 +4533,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3623,7 +3727,8 @@ AcpiDmDumpSlit (
+@@ -3623,7 +3726,8 @@ AcpiDmDumpSlit (
/* Display the Locality NxN Matrix */
@@ -4283,7 +4543,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
-@@ -3636,7 +3741,7 @@ AcpiDmDumpSlit (
+@@ -3636,7 +3740,7 @@ AcpiDmDumpSlit (
{
/* Check for beyond EOT */
@@ -4292,7 +4552,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
AcpiOsPrintf (
"\n**** Not enough room in table for all localities\n");
-@@ -3688,11 +3793,13 @@ AcpiDmDumpSrat (
+@@ -3688,11 +3792,13 @@ AcpiDmDumpSrat (
UINT32 Offset = sizeof (ACPI_TABLE_SRAT);
ACPI_SUBTABLE_HEADER *SubTable;
ACPI_DMTABLE_INFO *InfoTable;
@@ -4307,7 +4567,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3701,12 +3808,12 @@ AcpiDmDumpSrat (
+@@ -3701,12 +3807,12 @@ AcpiDmDumpSrat (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@@ -4322,7 +4582,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
SubTable->Length, AcpiDmTableInfoSratHdr);
if (ACPI_FAILURE (Status))
{
-@@ -3755,7 +3862,7 @@ AcpiDmDumpSrat (
+@@ -3755,7 +3861,7 @@ AcpiDmDumpSrat (
}
AcpiOsPrintf ("\n");
@@ -4331,7 +4591,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
SubTable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
-@@ -3792,13 +3899,14 @@ AcpiDmDumpStao (
+@@ -3792,13 +3898,14 @@ AcpiDmDumpStao (
{
ACPI_STATUS Status;
char *Namepath;
@@ -4347,7 +4607,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
if (ACPI_FAILURE (Status))
{
-@@ -3807,7 +3915,7 @@ AcpiDmDumpStao (
+@@ -3807,7 +3914,7 @@ AcpiDmDumpStao (
/* The rest of the table consists of Namepath strings */
@@ -4356,7 +4616,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
{
Namepath = ACPI_ADD_PTR (char, Table, Offset);
StringLength = strlen (Namepath) + 1;
-@@ -3849,11 +3957,14 @@ AcpiDmDumpTcpa (
+@@ -3849,11 +3956,14 @@ AcpiDmDumpTcpa (
ACPI_TABLE_TCPA_HDR *SubTable = ACPI_ADD_PTR (
ACPI_TABLE_TCPA_HDR, Table, Offset);
ACPI_STATUS Status;
@@ -4372,7 +4632,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
0, AcpiDmTableInfoTcpaHdr);
if (ACPI_FAILURE (Status))
{
-@@ -3864,18 +3975,19 @@ AcpiDmDumpTcpa (
+@@ -3864,18 +3974,19 @@ AcpiDmDumpTcpa (
* Examine the PlatformClass field to determine the table type.
* Either a client or server table. Only one.
*/
@@ -4397,7 +4657,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
break;
default:
-@@ -3912,11 +4024,13 @@ AcpiDmDumpVrtc (
+@@ -3912,11 +4023,13 @@ AcpiDmDumpVrtc (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
ACPI_VRTC_ENTRY *SubTable;
@@ -4412,7 +4672,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3925,12 +4039,12 @@ AcpiDmDumpVrtc (
+@@ -3925,12 +4038,12 @@ AcpiDmDumpVrtc (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
@@ -4427,7 +4687,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
if (ACPI_FAILURE (Status))
{
-@@ -3965,11 +4079,13 @@ AcpiDmDumpWdat (
+@@ -3965,11 +4078,13 @@ AcpiDmDumpWdat (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_WDAT);
ACPI_WDAT_ENTRY *SubTable;
@@ -4442,7 +4702,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
if (ACPI_FAILURE (Status))
{
return;
-@@ -3978,12 +4094,12 @@ AcpiDmDumpWdat (
+@@ -3978,12 +4093,12 @@ AcpiDmDumpWdat (
/* Subtables */
SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
@@ -4457,7 +4717,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
if (ACPI_FAILURE (Status))
{
-@@ -4018,12 +4134,13 @@ AcpiDmDumpWpbt (
+@@ -4018,12 +4133,13 @@ AcpiDmDumpWpbt (
{
ACPI_STATUS Status;
ACPI_TABLE_WPBT *SubTable;
@@ -4472,7 +4732,7 @@ Index: acpica-unix2-20170728/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
if (ACPI_FAILURE (Status))
{
-@@ -4033,10 +4150,10 @@ AcpiDmDumpWpbt (
+@@ -4033,10 +4149,10 @@ AcpiDmDumpWpbt (
/* Extract the arguments buffer length from the main table */
SubTable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
@@ -5218,6 +5478,22 @@ Index: acpica-unix2-20170728/source/components/disassembler/dmopcode.c
Info->BitOffset += Offset;
if (Info->BitOffset % 8 == 0)
+@@ -942,10 +949,15 @@ AcpiDmDisassembleOneOp (
+
+ if (Child->Common.AmlOpcode == AML_INT_BYTELIST_OP)
+ {
++ /* UINT64 Tmp64; */
++
+ AcpiOsPrintf ("\n");
+
+ Aml = Child->Named.Data;
++ /*
+ Length = (UINT32) Child->Common.Value.Integer;
++ */
++ Length = (UINT32) Child->Common.Value.Size;
+
+ Info->Level += 1;
+ Info->MappingOp = Op;
Index: acpica-unix2-20170728/source/components/disassembler/dmresrcl.c
===================================================================
--- acpica-unix2-20170728.orig/source/components/disassembler/dmresrcl.c
@@ -5562,7 +5838,7 @@ Index: acpica-unix2-20170728/source/components/disassembler/dmresrcl2.c
VendorData = ACPI_ADD_PTR (UINT8, Resource,
sizeof (AML_RESOURCE_UART_SERIALBUS));
-@@ -601,15 +621,19 @@ AcpiDmI2cSerialBusDescriptor (
+@@ -601,24 +621,29 @@ AcpiDmI2cSerialBusDescriptor (
{
UINT32 ResourceSourceOffset;
char *DeviceName;
@@ -5583,8 +5859,10 @@ Index: acpica-unix2-20170728/source/components/disassembler/dmresrcl2.c
+ Tmp32);
AcpiDmIndent (Level + 1);
++ ACPI_MOVE_16_TO_16(&Tmp16, &Resource->I2cSerialBus.TypeSpecificFlags);
AcpiOsPrintf ("%s, ",
-@@ -617,8 +641,8 @@ AcpiDmI2cSerialBusDescriptor (
+- AcpiGbl_AmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.TypeSpecificFlags)]);
++ AcpiGbl_AmDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
/* ResourceSource is a required field */
@@ -5848,7 +6126,39 @@ Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix2-20170728.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20170728/source/components/tables/tbfadt.c
-@@ -520,6 +520,8 @@ AcpiTbConvertFadt (
+@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
+ ACPI_TABLE_HEADER *Table,
+ UINT32 Length)
+ {
++ UINT32 Tmp32;
+
+ /*
+ * Check if the FADT is larger than the largest table that we expect
+ * (typically the current ACPI specification version). If so, truncate
+ * the table, and issue a warning.
+ */
+- if (Length > sizeof (ACPI_TABLE_FADT))
++ ACPI_MOVE_32_TO_32(&Tmp32, &Length);
++ if (Tmp32 > sizeof (ACPI_TABLE_FADT))
+ {
+ ACPI_BIOS_WARNING ((AE_INFO,
+ "FADT (revision %u) is longer than %s length, "
+ "truncating length %u to %u",
+- Table->Revision, ACPI_FADT_CONFORMANCE, Length,
++ Table->Revision, ACPI_FADT_CONFORMANCE, Tmp32,
+ (UINT32) sizeof (ACPI_TABLE_FADT)));
+ }
+
+@@ -446,7 +448,7 @@ AcpiTbCreateLocalFadt (
+ /* Copy the original FADT, up to sizeof (ACPI_TABLE_FADT) */
+
+ memcpy (&AcpiGbl_FADT, Table,
+- ACPI_MIN (Length, sizeof (ACPI_TABLE_FADT)));
++ ACPI_MIN (Tmp32, sizeof (ACPI_TABLE_FADT)));
+
+ /* Take a copy of the Hardware Reduced flag */
+
+@@ -520,6 +522,8 @@ AcpiTbConvertFadt (
UINT8 Length;
UINT8 Flags;
UINT32 i;
@@ -5857,7 +6167,7 @@ Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
/*
-@@ -533,7 +535,8 @@ AcpiTbConvertFadt (
+@@ -533,7 +537,8 @@ AcpiTbConvertFadt (
* Note: The FADT revision value is unreliable. Only the length can be
* trusted.
*/
@@ -5867,7 +6177,7 @@ Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
{
AcpiGbl_FADT.PreferredProfile = 0;
AcpiGbl_FADT.PstateControl = 0;
-@@ -546,14 +549,15 @@ AcpiTbConvertFadt (
+@@ -546,14 +551,15 @@ AcpiTbConvertFadt (
* current FADT version as defined by the ACPI specification.
* Thus, we will have a common FADT internally.
*/
@@ -5886,7 +6196,7 @@ Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
/* If Hardware Reduced flag is set, we are all done */
-@@ -614,7 +618,9 @@ AcpiTbConvertFadt (
+@@ -614,7 +620,9 @@ AcpiTbConvertFadt (
{
if (Address64->Address)
{
@@ -5897,7 +6207,7 @@ Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
{
/* Address mismatch */
-@@ -655,9 +661,11 @@ AcpiTbConvertFadt (
+@@ -655,9 +663,11 @@ AcpiTbConvertFadt (
*/
if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
{
@@ -5910,7 +6220,7 @@ Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
}
}
-@@ -780,10 +788,14 @@ AcpiTbSetupFadtRegisters (
+@@ -780,10 +790,14 @@ AcpiTbSetupFadtRegisters (
if (Source64->Address)
{
@@ -6247,3 +6557,36 @@ Index: acpica-unix2-20170728/source/tools/acpiexec/aetables.c
}
return (AE_OK);
+Index: acpica-unix2-20170728/source/common/dmswitch.c
+===================================================================
+--- acpica-unix2-20170728.orig/source/common/dmswitch.c
++++ acpica-unix2-20170728/source/common/dmswitch.c
+@@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
+ ACPI_PARSE_OBJECT_LIST *Current;
+ ACPI_PARSE_OBJECT_LIST *Previous;
+ BOOLEAN FoundTemp = FALSE;
++ UINT32 Tmp32;
+
+
+ switch (Op->Common.AmlOpcode)
+ {
+ case AML_NAME_OP:
+
+- Temp = (char *) (&Op->Named.Name);
++ ACPI_MOVE_32_TO_32(&Tmp32, &Op->Named.Name);
++ Temp = (char *) (&Tmp32);
+
+ if (!strncmp(Temp, "_T_", 3))
+ {
+@@ -138,7 +140,10 @@ AcpiDmProcessSwitch (
+ {
+ /* Note, if we get here Temp is not NULL */
+
+- if (!strncmp(Temp, (char *) (&Current->Op->Named.Name), 4))
++ ACPI_MOVE_32_TO_32(&Tmp32, &Current->Op->Named.Name);
++
++ /* if (!strncmp(Temp, (char *) (&Current->Op->Named.Name), 4)) */
++ if (!strncmp(Temp, (char *) &Tmp32, 4))
+ {
+ /* Match found. Ignore disassembly */
+
diff --git a/int-format.patch b/int-format.patch
index a0ae2ee..5618c91 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -275,7 +275,7 @@ Index: acpica-unix2-20170728/source/components/tables/tbfadt.c
RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-@@ -626,7 +626,7 @@ AcpiTbConvertFadt (
+@@ -628,7 +628,7 @@ AcpiTbConvertFadt (
ACPI_BIOS_WARNING ((AE_INFO,
"32/64X address mismatch in FADT/%s: "
diff --git a/ppc64le.patch b/ppc64le.patch
index 24c8edc..d2fa669 100644
--- a/ppc64le.patch
+++ b/ppc64le.patch
@@ -6,7 +6,7 @@ Index: acpica-unix2-20170728/source/include/platform/aclinux.h
#define __cdecl
#endif
-+#if defined(__BIG_ENDIAN__)
++#if defined(__BIG_ENDIAN)
#if defined(__PPC64__) || defined(__s390x__)
#define ACPI_BIG_ENDIAN
#endif
6 years, 10 months
Architecture specific change in rpms/acpica-tools.git
by githook-noreply@fedoraproject.org
The package rpms/acpica-tools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/acpica-tools.git/commit/?id=99f17....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 99f1748353feef9a07f3ae5cfd96ec73bb7e3f36
Author: Al Stone <ahs3(a)redhat.com>
Date: Fri Aug 18 17:44:43 2017 -0600
Re-enable full testing for s390x
Signed-off-by: Al Stone <ahs3(a)redhat.com>
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 292ee0e..b79ec9b 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -138,13 +138,7 @@ cd tests
[ $? -eq 0 ] || exit 1
# misc tests
-#
-# temporarily disable this test case on s390x, at least until the
-# remaining big-endian issues can be resolved; this appears to be
-# a false negative result but only on s390x
-%ifnarch s390x
./run-misc-tests.sh %{buildroot}%{_bindir} %{version}
-%endif
# Template tests
cd templates
@@ -194,6 +188,7 @@ fi
- Completed the big-endian fixes (I think)
- Fix ppc64le.patch that inadvertently broke s390x
- Minor patch refresh
+- Re-enable full %check for s390x
* Mon Aug 14 2017 Al Stone <ahs3(a)redhat.com> - 20170728-2
- Start some long delayed clean-up
6 years, 10 months
Architecture specific change in rpms/gridengine.git
by githook-noreply@fedoraproject.org
The package rpms/gridengine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gridengine.git/commit/?id=ad93a77....
Change:
-ExcludeArch: ppc64
Thanks.
Full change:
============
commit ad93a7773a452afbb316cd7857339d5898bd0052
Author: Orion Poplawski <orion(a)nwra.com>
Date: Fri Aug 18 14:11:10 2017 -0600
Mostly dead upstream and does not build with openssl 1.1
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ca401cf..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-ge-V62u5_TAG-src.tar.bz2
-gridengine-ppc.tar.gz
-/SGE6.2u5p2.tar.gz
-/GE2011.11.tar.gz
-/GE2011.11p1.tar.gz
diff --git a/Licenses b/Licenses
deleted file mode 100644
index 2e7fbc5..0000000
--- a/Licenses
+++ /dev/null
@@ -1,34 +0,0 @@
-Whole license: SISSL
-
-source/3rdparty/adoc/ GPL+ -> unused
-source/3rdparty/fnmatch/ BSD with advertising -> unused
-source/3rdparty/openssl/ OpenSSL -> unused
-source/3rdparty/qidl/ copyright only -> unused
-
-source/3rdparty/qmake/ GPL+ -> Installed as qmake
-source/3rdparty/qmake/alloca.c Public Domain? -> unused
-source/3rdparty/qmake/amiga.c GPLv2+ -> Installed as qmake
-(and others)
- ! Note
- qmake is not linked or used by other parts
- of gridengine
-
-source/3rdparty/qmon/Xbae/ MIT
-source/3rdparty/qmon/Xmt310/ BSD
-source/3rdparty/qmon/iconlist/ MIT
-source/3rdparty/qmon/ltree/ LGPL+
-source/3rdparty/qmon/spinbox/ MIT
-source/3rdparty/qmon/tab/ MIT
-
-source/3rdparty/qtcsh/ BSD with advertising -> Installed as qtcsh
-source/3rdparty/qtcsh/ma.setp.c MIT -> unused
- ! Note
- qtcsh is not linked or used by other parts
- of gridengine
-
-source/3rdparty/sge_depend/ MIT
-source/3rdparty/snprintf/ the Frontier Artistic License -> unused
-source/3rdparty/strptime/ BSD with advertising -> unused
-
-source/scripts/ldAix MIT -> unused
-
diff --git a/README b/README
deleted file mode 100644
index 0c1f854..0000000
--- a/README
+++ /dev/null
@@ -1,43 +0,0 @@
-Setting up a gridengine install using these RPMs is a little different than
-using the standard Sun courtesy binaries. The default configuration setup is geared
-for a "reduced NFS" install with logs going into the /var/spool/gridengine
-directories on each host.
-
-You probably want to edit /etc/hosts to remove any mentions of the hostname
-on the localhost line, like the following:
-
-127.0.0.1 localhost.localdomain localhost hostname
-
-- On the qmaster (and any shadow hosts) install gridengine-qmaster, then:
-
- 1)
- cd /usr/share/gridengine
- 2)
- ./install_qmaster [any desired options]
-
-OR
-
- edit my_configuration.conf to make any needed changes and run:
-
- ./install_qmaster -auto ./my_configuration.conf
-
- 3) Make sure the files act_qmaster, bootstrap, and settings.*sh from the
- directory /usr/share/gridengine/default/common/ are shared to all clients.
- If you don't run with a shadow master configuration you can simply copy
- these files to the other machines.
-
-If you change the default SGE_ROOT or SGE_CELL values, you will need to
-edit /etc/sysconfig/gridengine and change them there as well for the startup
-scripts to work.
-
-- On execution hosts install gridengine-execd, then:
-
- cd /usr/share/gridengine
- ./install_execd
-
-OR if you have a default install, you may be able to just do:
-
- systemctl enable sge_execd
- systemctl start sge_execd
-
-- On submit hosts install gridengine
diff --git a/README.mingw b/README.mingw
deleted file mode 100644
index 1894062..0000000
--- a/README.mingw
+++ /dev/null
@@ -1,8 +0,0 @@
-I took a look at compiling gridengine with mingw. Current stumbling block is
-that mingw32-w32api does not have pdh.h/libpdh.a (pdh.dll) from the Windows SDK.
-
-Filed: https://sourceforge.net/tracker/?func=detail&aid=3509880&group_id=2435&at...
-
-The patch gridengine-mingw.patch adds a -mingw32 flag for aimk to use for the
-compile step after dependencies have been generated. (Strange, but you need
-native tools to generate the deps)
diff --git a/conf_defaults b/conf_defaults
deleted file mode 100644
index b0f48f7..0000000
--- a/conf_defaults
+++ /dev/null
@@ -1,16 +0,0 @@
-SGE_ROOT="/usr/share/gridengine"
-SGE_QMASTER_PORT=6444
-SGE_EXECD_PORT=6445
-SGE_CLUSTER_NAME="p6444"
-SGE_JVM_LIB_PATH="none"
-QMASTER_SPOOL_DIR="/var/spool/gridengine/default/qmaster"
-EXECD_SPOOL_DIR="/var/spool/gridengine"
-GID_RANGE="16000-16100"
-DB_SPOOLING_DIR="/var/spool/gridengine/default/spooldb"
-ADMIN_HOST_LIST=""
-SUBMIT_HOST_LIST=""
-EXEC_HOST_LIST=""
-EXECD_SPOOL_DIR_LOCAL="/var/spool/gridengine"
-SET_FILE_PERMS="false"
-SHADOW_HOST=""
-EXEC_HOST_LIST_RM=""
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..717a078
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Mostly dead upstream and does not build with openssl 1.1
diff --git a/gridengine-6.2-jni.patch b/gridengine-6.2-jni.patch
deleted file mode 100644
index d4bec03..0000000
--- a/gridengine-6.2-jni.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gridengine/source/daemons/qmaster/sge_thread_jvm.c.jni 2008-07-10 10:05:22.000000000 -0600
-+++ gridengine/source/daemons/qmaster/sge_thread_jvm.c 2008-11-04 15:14:53.000000000 -0700
-@@ -766,11 +766,17 @@
- jvm_argv[2] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.caTop=%s", ctx->get_ca_root(ctx)));
- jvm_argv[3] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.serverKeystore=%s", keystore_path));
- jvm_argv[4] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.sgeQmasterSpoolDir=%s", ctx->get_qmaster_spool_dir(ctx)));
-- jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=%s/lib/jgdi.jar:%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
-+ char *libdir;
-+ if (strstr(sge_get_arch(),"64") != NULL) {
-+ libdir = "lib64";
-+ } else {
-+ libdir = "lib";
-+ }
-+ jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=/usr/%s/gridengine/jgdi.jar:/usr/%s/gridengine/juti.jar", libdir, libdir));
- jvm_argv[6] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.policy=%s/common/jmx/java.policy", ctx->get_cell_root(ctx)));
- jvm_argv[7] = strdup("-Djava.security.manager=com.sun.grid.jgdi.management.JGDISecurityManager");
-- jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file://%s/lib/jgdi.jar file://%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
-- jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=%s/lib/%s", ctx->get_sge_root(ctx), sge_get_arch()));
-+ jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file:///usr/%s/gridengine/jgdi.jar file:///usr/%s/gridengine/juti.jar", libdir, libdir));
-+ jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=/usr/%s/gridengine", libdir));
- jvm_argv[10] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.access.file=%s/common/jmx/jmxremote.access", ctx->get_cell_root(ctx)));
- jvm_argv[11] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.password.file=%s/common/jmx/jmxremote.password", ctx->get_cell_root(ctx)));
- jvm_argv[12] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.auth.login.config=%s/common/jmx/jaas.config", ctx->get_cell_root(ctx)));
---- gridengine/source/libs/jgdi/util/java.policy.template.jni 2008-02-13 07:35:11.000000000 -0700
-+++ gridengine/source/libs/jgdi/util/java.policy.template 2008-11-06 09:32:31.000000000 -0700
-@@ -39,7 +39,7 @@
- ** grant principal javax.management.remote.JMXPrincipal "controlRole"
- **
- */
--grant codeBase "file:${com.sun.grid.jgdi.sgeRoot}/lib/jgdi.jar" {
-+grant codeBase "file:${java.library.path}/jgdi.jar" {
- permission java.net.SocketPermission "*:1024-", "accept,connect";
- permission java.net.SocketPermission "localhost:1024-", "listen,resolve";
- permission java.lang.RuntimePermission "loadLibrary.jgdi";
diff --git a/gridengine-6.2u2_1-izpack.patch b/gridengine-6.2u2_1-izpack.patch
deleted file mode 100644
index 8f00601..0000000
--- a/gridengine-6.2u2_1-izpack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gridengine/source/clients/gui-installer/build.xml.izpack 2009-02-16 04:15:38.000000000 -0700
-+++ gridengine/source/clients/gui-installer/build.xml 2009-03-25 14:05:54.000000000 -0600
-@@ -66,20 +66,20 @@
- <echo message="Check IzPack"/>
- <!-- Check IzPack is build, if not build it -->
- <condition property="izpack.isbuild">
-- <available file="${izpack.home}/_build"/>
-+ <available file="${izpack.lib}/standalone-compiler.jar"/>
- </condition>
- <antcall target="build.izpack"/>
- <!-- Check that IzPack was build and we have it on the classpath -->
- <condition property="izpack.complete">
- <available classpath="${javac.classpath}" classname="com.izforge.izpack.installer.IzPanel"/>
- </condition>
-- <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.home property in the gridengine/source/build_private.properties first!"/>
-+ <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.lib property in the gridengine/source/build_private.properties first!"/>
-
- <!-- Let's copy the stuff we need locally to our build.dir, so each user works with his own files -->
- <property name="build.panels.dir" value="bin/panels"/>
- <property name="compiler.path" value="${build.dir}/standalone-compiler.jar"/>
- <mkdir dir="${build.panels.dir}"/>
-- <copyfile src="${izpack.home}/lib/standalone-compiler.jar" dest="${compiler.path}"/>
-+ <copyfile src="${izpack.lib}/standalone-compiler.jar" dest="${compiler.path}"/>
-
- <echo message="Building prerequsities from source/3rdparty/IzPack/src ..."/>
- <javac srcdir="../../3rdparty/IzPack/src"
diff --git a/gridengine-6.2u2_1-sge_ca.patch b/gridengine-6.2u2_1-sge_ca.patch
deleted file mode 100644
index 97c5bd7..0000000
--- a/gridengine-6.2u2_1-sge_ca.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- gridengine/source/dist/util/sgeCA/sge_ca.sge_ca 2008-12-08 13:38:02.000000000 -0700
-+++ gridengine/source/dist/util/sgeCA/sge_ca 2009-03-19 16:11:13.000000000 -0600
-@@ -928,7 +928,10 @@
- return 1
- fi
-
-- JVM_ARGS="-cp $ROOT_PATH/lib/juti.jar"
-+ case "$ARCH" in
-+ *64) JVM_ARGS="-cp /usr/lib64/gridengine/juti.jar";;
-+ *) JVM_ARGS="-cp /usr/lib/gridengine/juti.jar";;
-+ esac
- JVM_ARGS="$JVM_ARGS -Djava.util.logging.config.file=$ROOT_PATH/util/sgeCA/logging.properties"
-
- OUTPUT=`$JAVA $JVM_ARGS com.sun.grid.ca.Main $CA_ARGS 2>&1`
-@@ -1722,22 +1725,6 @@
- exit 1
- fi
-
--if [ ! -d "$ROOT_PATH/lib/$ARCH" ]; then
-- echo
-- echo "Error: The lib directory \"$ROOT_PATH/lib/$ARCH\" does not exist"
-- echo "Please verify your setup and restart this script. Exit."
-- exit 1
--fi
--
--shlib_path_name=`$ROOT_PATH/util/arch -lib`
--old_shlib_path_name=`eval echo '$'$shlib_path_name`
--if [ x$old_shlib_path_name = x ]; then
-- eval $shlib_path_name=$ROOT_PATH/lib/$ARCH
--else
-- eval $shlib_path_name="$ROOT_PATH/lib/${ARCH}:${old_shlib_path_name}"
--fi
--export $shlib_path_name
--
- #---------------------------------------
- # setup INFOTEXT begin
- #---------------------------------------
-@@ -1776,7 +1763,7 @@
- #
- # Check wether all needed binaries are exists
- #
--for i in adminrun openssl uidgid; do
-+for i in adminrun uidgid; do
- if [ ! -x $V5UTILBIN/$i ]; then
- PrintErrorAndExit 1 "Error: Can't find binary \"%s\"" $V5UTILBIN/$i
- fi
-@@ -1805,7 +1792,7 @@
-
- CAKEY=cakey.pem
- CACERT=cacert.pem
--OPENSSL=$V5UTILBIN/openssl
-+OPENSSL=/usr/bin/openssl
-
- AUTO="false"
- #-----------------------------
diff --git a/gridengine-6.2u5-gethostname.patch b/gridengine-6.2u5-gethostname.patch
deleted file mode 100644
index aee2dca..0000000
--- a/gridengine-6.2u5-gethostname.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gridengine/source/dist/util/install_modules/inst_common.sh.gethostname 2010-08-26 07:57:41.000000000 +1200
-+++ gridengine/source/dist/util/install_modules/inst_common.sh 2010-11-23 10:24:51.932798405 +1300
-@@ -1569,18 +1569,37 @@
- #-------------------------------------------------------------------------
- # CheckForLocalHostResolving
- # "localhost", localhost.localdomain and 127.0.x.x are not supported
-+# if there are no other names or no other ip addresses
- #
- #
- CheckForLocalHostResolving()
- {
-- output=`$SGE_UTILBIN/gethostname| cut -f2 -d:`
-+ output=`$SGE_UTILBIN/gethostname| grep "^Host" | cut -f2 -d:`
-+
-+ notok=true
-+ hostok=false
-+ ipok=false
-
-- notok=false
- for cmp in $output; do
- case "$cmp" in
-- localhost*|127.0*)
-- notok=true
-+ (localhost*|127.0*)
- ;;
-+ (*)
-+ isIp=`IsIpAddress $cmp `
-+ if [ $? -eq 1 ]; then
-+ if [ $hostok = true ]; then
-+ notok=false
-+ break
-+ fi
-+ ipok=true
-+ else
-+ if [ $ipok = true ]; then
-+ notok=false
-+ break
-+ fi
-+ hostok=true
-+ fi
-+ ;;
- esac
- done
-
diff --git a/gridengine-add-aarch64.patch b/gridengine-add-aarch64.patch
deleted file mode 100644
index 4674ec8..0000000
--- a/gridengine-add-aarch64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-armv8* is 32bit on 64bit hardware
-
-Index: GE2011.11p1/source/dist/util/arch
-===================================================================
---- GE2011.11p1.orig/source/dist/util/arch
-+++ GE2011.11p1/source/dist/util/arch
-@@ -229,7 +229,7 @@ Linux)
- s390x)
- lxmachine=s390x
- ;;
-- armv8*)
-+ aarch64*)
- lxmachine=arm64
- ;;
- arm*)
-Index: GE2011.11p1/source/aimk
-===================================================================
---- GE2011.11p1.orig/source/aimk
-+++ GE2011.11p1/source/aimk
-@@ -2325,6 +2325,9 @@ if ( $JNI == 1 ) then
- set JAVA_LIB_ARCH = amd64
- endif
- breaksw
-+ case linux-arm64:
-+ set JAVA_LIB_ARCH = aarch64
-+ breaksw
- case linux-arm:
- set JAVA_LIB_ARCH = arm
- breaksw
diff --git a/gridengine-arm.patch b/gridengine-arm.patch
deleted file mode 100644
index a092a84..0000000
--- a/gridengine-arm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up GE2011.11/source/aimk.arm GE2011.11/source/aimk
---- GE2011.11/source/aimk.arm 2012-04-17 10:30:18.892872672 -0600
-+++ GE2011.11/source/aimk 2012-07-06 11:21:41.691920730 -0600
-@@ -2325,6 +2325,9 @@ if ( $JNI == 1 ) then
- set JAVA_LIB_ARCH = amd64
- endif
- breaksw
-+ case linux-arm:
-+ set JAVA_LIB_ARCH = arm
-+ breaksw
- case linux-ia64:
- set JAVA_LIB_ARCH = ia64
- breaksw
diff --git a/gridengine-format.patch b/gridengine-format.patch
deleted file mode 100644
index 6eb807a..0000000
--- a/gridengine-format.patch
+++ /dev/null
@@ -1,4339 +0,0 @@
-diff -up GE2011.11p1/source/3rdparty/qmake/remote-stub.c.format GE2011.11p1/source/3rdparty/qmake/remote-stub.c
---- GE2011.11p1/source/3rdparty/qmake/remote-stub.c.format 2012-05-23 13:04:55.000000000 -0600
-+++ GE2011.11p1/source/3rdparty/qmake/remote-stub.c 2014-10-03 21:18:11.271530498 -0600
-@@ -342,7 +342,7 @@ static void remote_exit(int code, const
- }
-
- if(message) {
-- fprintf(stderr, message);
-+ fprintf(stderr, "%s", message);
- }
-
- if(reason) {
-diff -up GE2011.11p1/source/clients/common/read_defaults.c.format GE2011.11p1/source/clients/common/read_defaults.c
---- GE2011.11p1/source/clients/common/read_defaults.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/common/read_defaults.c 2014-10-03 21:11:16.286851285 -0600
-@@ -223,7 +223,7 @@ static char *get_cwd_defaults_file_path(
- DENTER (TOP_LAYER, "get_cwd_defaults_file_name");
-
- if (!getcwd(cwd, sizeof(cwd))) {
-- sprintf(str, MSG_FILE_CANTREADCURRENTWORKINGDIR);
-+ sprintf(str, "%s", MSG_FILE_CANTREADCURRENTWORKINGDIR);
- answer_list_add(answer_list, str, STATUS_EDISK, ANSWER_QUALITY_ERROR);
- }
-
-diff -up GE2011.11p1/source/clients/common/sge_cqueue_qconf.c.format GE2011.11p1/source/clients/common/sge_cqueue_qconf.c
---- GE2011.11p1/source/clients/common/sge_cqueue_qconf.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/common/sge_cqueue_qconf.c 2014-10-03 21:11:16.286851285 -0600
-@@ -788,7 +788,7 @@ cqueue_list_sick(sge_gdi_ctx_class_t *ct
- }
-
- if (sge_dstring_get_string(&ds)) {
-- printf(sge_dstring_get_string(&ds));
-+ printf("%s", sge_dstring_get_string(&ds));
- ret = false;
- }
-
-diff -up GE2011.11p1/source/clients/qacct/qacct.c.format GE2011.11p1/source/clients/qacct/qacct.c
---- GE2011.11p1/source/clients/qacct/qacct.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qacct/qacct.c 2014-10-03 21:11:16.287851309 -0600
-@@ -460,7 +460,7 @@ int main(int argc, char **argv)
- options.arflag = 1;
- } else {
- if (sscanf(argv[++ii], sge_u32, &options.ar_number) != 1) {
-- fprintf(stderr, MSG_PARSE_INVALID_AR_MUSTBEUINT);
-+ fprintf(stderr, "%s", MSG_PARSE_INVALID_AR_MUSTBEUINT);
- fprintf(stderr, "\n");
- qacct_usage(&ctx, stderr);
- DRETURN(1);
-@@ -694,7 +694,7 @@ int main(int argc, char **argv)
- QAJ_arid);
- summary_view = true;
- if (sorted_list == NULL || sort_order == NULL) {
-- ERROR((SGE_EVENT, MSG_HISTORY_NOTENOUGTHMEMORYTOCREATELIST));
-+ ERROR((SGE_EVENT, "%s", MSG_HISTORY_NOTENOUGTHMEMORYTOCREATELIST));
- goto QACCT_EXIT;
- }
- }
-@@ -891,7 +891,7 @@ int main(int argc, char **argv)
- SGE_EXIT((void**)&ctx, 0);
- }
- } else if (options.taskstart && options.taskend && options.taskstep) {
-- ERROR((SGE_EVENT, MSG_HISTORY_TOPTIONREQUIRESJOPTION ));
-+ ERROR((SGE_EVENT, "%s", MSG_HISTORY_TOPTIONREQUIRESJOPTION ));
- qacct_usage(&ctx, stderr);
- free_qacct_lists(¢ry_list, &queue_list, &exechost_list, &hgrp_list);
- SGE_EXIT((void**)&ctx, 0);
-diff -up GE2011.11p1/source/clients/qconf/parse_qconf.c.format GE2011.11p1/source/clients/qconf/parse_qconf.c
---- GE2011.11p1/source/clients/qconf/parse_qconf.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qconf/parse_qconf.c 2014-10-03 21:11:16.288851332 -0600
-@@ -3082,7 +3082,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t
- /* parse command line arguments */
- attr = sge_strdup(NULL, *spp);
- if (attr == NULL) {
-- ERROR((SGE_EVENT, MSG_QCONF_NOATTRIBUTEGIVEN));
-+ ERROR((SGE_EVENT, "%s", MSG_QCONF_NOATTRIBUTEGIVEN));
- DRETURN(1);
- }
- spp = sge_parser_get_next(ctx, spp);
-@@ -3327,7 +3327,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t
- }
-
- if (ep == NULL) {
-- fprintf(stderr, errstr);
-+ fprintf(stderr, "%s", errstr);
- if (sge_error_and_exit(ctx, MSG_FILE_ERRORREADINGINFILE))
- continue;
- }
-@@ -4174,7 +4174,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t
- lFreeElem(&hep);
- }
- else {
-- fprintf(stderr, MSG_ANSWER_NEEDHOSTNAMETODELLOCALCONFIG);
-+ fprintf(stderr, "%s", MSG_ANSWER_NEEDHOSTNAMETODELLOCALCONFIG);
- fprintf(stderr, "\n");
- sge_parse_return = 1;
- }
-@@ -6324,7 +6324,7 @@ static int show_eventclients(sge_gdi_ctx
- }
- }
- else {
-- fprintf(stderr, MSG_QCONF_NOEVENTCLIENTSREGISTERED);
-+ fprintf(stderr, "%s", MSG_QCONF_NOEVENTCLIENTSREGISTERED);
- fprintf(stderr, "\n");
- }
- lFreeList(&alp);
-@@ -6432,7 +6432,7 @@ static int show_processors(sge_gdi_ctx_c
- printf("\n");
- }
- else {
-- fprintf(stderr, MSG_QCONF_NOEXECUTIONHOSTSDEFINED );
-+ fprintf(stderr, "%s", MSG_QCONF_NOEXECUTIONHOSTSDEFINED );
- fprintf(stderr, "\n");
- }
-
-@@ -7093,7 +7093,7 @@ static int qconf_modify_attribute(sge_gd
- DRETURN(1);
- }
- if (*epp == NULL){
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_FILE_ERRORREADINGINFILE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_FILE_ERRORREADINGINFILE));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DRETURN(1);
- }
-@@ -7231,7 +7231,7 @@ static int qconf_modify_attribute(sge_gd
- lList *lp = lGetList(*epp, fields[0]);
-
- if (lp == NULL || lGetNumberOfElem(lp) == 0) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_QCONF_CANT_MODIFY_NONE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_QCONF_CANT_MODIFY_NONE));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- lFreeElem(epp);
- lFreeWhat(&what);
-@@ -7249,7 +7249,7 @@ static int qconf_modify_attribute(sge_gd
- for (nm = ep->descr[0].nm; nm != NoName; nm = ep->descr[count++].nm) {
- if (lGetType(ep->descr, nm) == lListT) {
- if (lGetList(ep, nm) == NULL) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_QCONF_CANT_MODIFY_NONE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_QCONF_CANT_MODIFY_NONE));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- lFreeElem(epp);
- lFreeWhat(&what);
-diff -up GE2011.11p1/source/clients/qmod/qmod.c.format GE2011.11p1/source/clients/qmod/qmod.c
---- GE2011.11p1/source/clients/qmod/qmod.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmod/qmod.c 2014-10-03 21:11:16.289851355 -0600
-@@ -472,7 +472,7 @@ int usageshowed = 0;
- }
-
- if(lGetNumberOfElem(*ppcmdline)) {
-- sprintf(str, MSG_PARSE_TOOMANYOPTIONS);
-+ sprintf(str, "%s", MSG_PARSE_TOOMANYOPTIONS);
- if(!usageshowed)
- qmod_usage(stderr, NULL);
- answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
-diff -up GE2011.11p1/source/clients/qmon/qmon_arsub.c.format GE2011.11p1/source/clients/qmon/qmon_arsub.c
---- GE2011.11p1/source/clients/qmon/qmon_arsub.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_arsub.c 2014-10-03 21:11:16.289851355 -0600
-@@ -809,7 +809,7 @@ static void qmonARSubARSub(Widget w, XtP
- pe = strtok(theInput, " ");
- pe_range = strtok(NULL, "\n");
- if (!(pe_range && pe_range[0] != '\0')) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -822,7 +822,7 @@ static void qmonARSubARSub(Widget w, XtP
- 1, 0, INF_ALLOWED);
- lFreeList(&range_list);
- if (alp) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -835,7 +835,7 @@ static void qmonARSubARSub(Widget w, XtP
-
- if (!(lp = lCreateElemList("ARSubList", AR_Type, 1))) {
- DPRINTF(("lCreateElemList failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "AR submission failed",
- "AR submission failed")
-@@ -845,7 +845,7 @@ static void qmonARSubARSub(Widget w, XtP
-
- if (!qmonARSMToCull(&ARSMData, lFirst(lp), 0)) {
- DPRINTF(("qmonARSMToCull failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "AR submission failed",
- "AR submission failed")
-@@ -885,7 +885,7 @@ static void qmonARSubARSub(Widget w, XtP
- XmtLocalize(w, "AR %d failed", "AR %d failed"),
- ar_id);
- } else {
-- XmtMsgLinePrintf(arsub_message,
-+ XmtMsgLinePrintf(arsub_message, "%s",
- XmtLocalize(w, "AR Submission failed",
- "AR Submission failed"));
- }
-diff -up GE2011.11p1/source/clients/qmon/qmon_comm.c.format GE2011.11p1/source/clients/qmon/qmon_comm.c
---- GE2011.11p1/source/clients/qmon/qmon_comm.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_comm.c 2014-10-03 21:11:16.290851379 -0600
-@@ -221,7 +221,7 @@ lList **answerp
- }
-
- if (ctx->is_alive(ctx) != CL_RETVAL_OK) {
-- sprintf(msg, XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
-+ sprintf(msg, "%s", XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
- contact_ok = XmtDisplayErrorAndAsk(AppShell, "nocontact",
- msg, "@{Retry}", "@{Abort}",
- XmtYesButton, NULL);
-diff -up GE2011.11p1/source/clients/qmon/qmon_main.c.format GE2011.11p1/source/clients/qmon/qmon_main.c
---- GE2011.11p1/source/clients/qmon/qmon_main.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_main.c 2014-10-03 21:11:16.290851379 -0600
-@@ -359,19 +359,19 @@ static void qmonUsage(Widget w)
-
- printf("%s %s\n", GE_SHORTNAME, GDI_VERSION);
- /* printf("%s\n", feature_get_product_name(FS_SHORT_VERSION, &ds)); */
-- printf(XmtLocalize2(w, "usage: qmon\n", "qmon_usage", "usageTitle"));
-+ printf("%s", XmtLocalize2(w, "usage: qmon\n", "qmon_usage", "usageTitle"));
- printf(" [-cmap] ");
-- printf(XmtLocalize2(w, "use own colormap\n", "qmon_usage", "cmapOption"));
-+ printf("%s", XmtLocalize2(w, "use own colormap\n", "qmon_usage", "cmapOption"));
- printf(" [-help] ");
-- printf(XmtLocalize2(w, "show this information and exit\n",
-+ printf("%s", XmtLocalize2(w, "show this information and exit\n",
- "qmon_usage", "helpOption"));
- printf(" [-fontFamily {big|medium|small}] ");
-- printf(XmtLocalize2(w, "use small/medium/big fonts\n",
-+ printf("%s", XmtLocalize2(w, "use small/medium/big fonts\n",
- "qmon_usage", "fontFamilyOption"));
- printf(" [-nologo] ");
-- printf(XmtLocalize2(w, "startup without logo\n",
-+ printf("%s", XmtLocalize2(w, "startup without logo\n",
- "qmon_usage", "nologoOption"));
-- printf(XmtLocalize2(w, "Additionally the default X commandline switches can be used.\nFor further information see the manual page X(1)\n",
-+ printf("%s", XmtLocalize2(w, "Additionally the default X commandline switches can be used.\nFor further information see the manual page X(1)\n",
- "qmon_usage", "X11OptionInfo"));
-
- DEXIT;
-diff -up GE2011.11p1/source/clients/qmon/qmon_message.c.format GE2011.11p1/source/clients/qmon/qmon_message.c
---- GE2011.11p1/source/clients/qmon/qmon_message.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_message.c 2014-10-03 21:11:16.290851379 -0600
-@@ -86,7 +86,7 @@ void qmonMessageShow(Widget w, Boolean m
- }
-
- if (msg_box) {
-- XmtDisplayWarningMsg(w, "XmtMessageBox", buf, "Warning", NULL);
-+ XmtDisplayWarningMsg(w, "XmtMessageBox", "%x", "Warning", NULL, buf);
- XSync(XtDisplay(w), 0);
- XmUpdateDisplay(w);
- }
-diff -up GE2011.11p1/source/clients/qmon/qmon_preferences.c.format GE2011.11p1/source/clients/qmon/qmon_preferences.c
---- GE2011.11p1/source/clients/qmon/qmon_preferences.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_preferences.c 2014-10-03 21:11:16.291851402 -0600
-@@ -469,7 +469,7 @@ static lListElem* read_object( const cha
- if (!(ep = lCreateElem(args->objtype))) {
- FCLOSE(fp);
- free(buf);
-- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- DEXIT;
- return NULL;
- }
-@@ -477,7 +477,7 @@ static lListElem* read_object( const cha
- /* read in config file */
- if (read_config_list(fp, &clp, &alp, CF_Type, CF_name, CF_value,
- CF_sublist, NULL, read_config_list_flag, buf, size)) {
-- ERROR((SGE_EVENT, lGetString(lFirst(alp), AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(lFirst(alp), AN_text)));
- lFreeList(&alp);
- FCLOSE(fp);
- free(buf);
-@@ -492,7 +492,7 @@ static lListElem* read_object( const cha
- ret = args->work_func(&alp, &clp, fields, ep, spool, flag, tag, 0);
- if (ret) {
- if (alp)
-- ERROR((SGE_EVENT, lGetString(lFirst(alp), AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(lFirst(alp), AN_text)));
- lFreeList(&alp);
- lFreeList(&clp);
- lFreeElem(&ep);
-diff -up GE2011.11p1/source/clients/qmon/qmon_submit.c.format GE2011.11p1/source/clients/qmon/qmon_submit.c
---- GE2011.11p1/source/clients/qmon/qmon_submit.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_submit.c 2014-10-03 21:11:16.292851425 -0600
-@@ -1366,7 +1366,7 @@ static void qmonSubmitJobSubmit(Widget w
- */
- if ((!SMData.job_script || SMData.job_script[0] == '\0') &&
- !ISSET(submit_mode_data.sub_mode, SUBMIT_QSH)) {
-- sprintf(buf, XmtLocalize(w, "Job Script required !",
-+ sprintf(buf, "%s", XmtLocalize(w, "Job Script required !",
- "Job Script required !"));
- goto error;
- }
-@@ -1381,7 +1381,7 @@ static void qmonSubmitJobSubmit(Widget w
- pe = strtok(theInput, " ");
- pe_range = strtok(NULL, "\n");
- if (!(pe_range && pe_range[0] != '\0')) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -1394,7 +1394,7 @@ static void qmonSubmitJobSubmit(Widget w
- 1, 0, INF_ALLOWED);
- lFreeList(&range_list);
- if (alp) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -1407,7 +1407,7 @@ static void qmonSubmitJobSubmit(Widget w
-
- if (!(lp = lCreateElemList("JobSubmitList", JB_Type, 1))) {
- DPRINTF(("lCreateElemList failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Job submission failed",
- "Job submission failed")
-@@ -1417,7 +1417,7 @@ static void qmonSubmitJobSubmit(Widget w
-
- if (!qmonSMToCull(&SMData, lFirst(lp), 0)) {
- DPRINTF(("qmonSMToCull failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Job submission failed",
- "Job submission failed")
-@@ -1431,7 +1431,7 @@ static void qmonSubmitJobSubmit(Widget w
- if (set_sec_cred(sge_root, mastername, lFirst(lp), &alp) != 0) {
- qmonMessageBox(w, alp, true);
- lFreeList(&alp);
-- sprintf(buf, MSG_SEC_SETJOBCRED);
-+ sprintf(buf, "%s", MSG_SEC_SETJOBCRED);
- sprintf(buf, "\n");
- goto error;
- }
-@@ -1481,7 +1481,7 @@ static void qmonSubmitJobSubmit(Widget w
- XmtLocalize(w, "Job %d failed", "Job %d failed"),
- jobid);
- else
-- XmtMsgLinePrintf(submit_message,
-+ XmtMsgLinePrintf(submit_message, "%s",
- XmtLocalize(w, "Job Submission failed",
- "Job Submission failed"));
- XmtMsgLineClear(submit_message, DISPLAY_MESSAGE_DURATION);
-diff -up GE2011.11p1/source/clients/qmon/qmon_ticket.c.format GE2011.11p1/source/clients/qmon/qmon_ticket.c
---- GE2011.11p1/source/clients/qmon/qmon_ticket.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_ticket.c 2014-10-03 21:11:16.292851425 -0600
-@@ -503,9 +503,9 @@ static void qmonTOVApply(Widget w, XtPoi
- qmonMessageBox(w, alp, 0);
-
- if (alp && lGetUlong(lFirst(alp), AN_status) != STATUS_OK)
-- XmtMsgLinePrintf(tov_message, XmtLocalize(w, "Failure", "Failure"));
-+ XmtMsgLinePrintf(tov_message, "%s", XmtLocalize(w, "Failure", "Failure"));
- else
-- XmtMsgLinePrintf(tov_message, XmtLocalize(w, "Success", "Success"));
-+ XmtMsgLinePrintf(tov_message, "%s", XmtLocalize(w, "Success", "Success"));
- XmtMsgLineClear(tov_message, DISPLAY_MESSAGE_DURATION);
-
- data_changed = False;
-diff -up GE2011.11p1/source/clients/qmon/qmon_timer.c.format GE2011.11p1/source/clients/qmon/qmon_timer.c
---- GE2011.11p1/source/clients/qmon/qmon_timer.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_timer.c 2014-10-03 21:11:16.292851425 -0600
-@@ -393,7 +393,7 @@ XtIntervalId *id
- DENTER(GUI_LAYER, "qmonTimerCheckInteractiveJob");
-
- if (ctx->is_alive(ctx) != CL_RETVAL_OK) {
-- sprintf(msg, XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
-+ sprintf(msg, "%s", XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
- contact_ok = XmtDisplayErrorAndAsk(AppShell, "nocontact",
- msg, "@{Retry}", "@{Abort}",
- XmtYesButton, NULL);
-diff -up GE2011.11p1/source/clients/qmon/qmon_util.c.format GE2011.11p1/source/clients/qmon/qmon_util.c
---- GE2011.11p1/source/clients/qmon/qmon_util.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_util.c 2014-10-03 21:11:16.293851448 -0600
-@@ -960,7 +960,7 @@ void XmListAddItemUniqueSorted(Widget li
- if (item[0] == '@' && item[1] != '{')
- sprintf(buf, "@%s", item);
- else
-- sprintf(buf, item);
-+ sprintf(buf, "%s", item);
- xmitem = XmtCreateLocalizedXmString(list, buf);
- if (XmListItemExists(list, xmitem)) {
- XmStringFree(xmitem);
-diff -up GE2011.11p1/source/clients/qrsh/qrsh_starter.c.format GE2011.11p1/source/clients/qrsh/qrsh_starter.c
---- GE2011.11p1/source/clients/qrsh/qrsh_starter.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qrsh/qrsh_starter.c 2014-10-03 21:11:16.293851448 -0600
-@@ -239,7 +239,7 @@ static char *setEnvironment(const char *
- strcpy(command, line + 13);
- } else if (strncmp(line, "QRSH_WRAPPER=", 13) == 0) {
- if (*(line + 13) == 0) {
-- fprintf(stderr, MSG_QRSH_STARTER_EMPTY_WRAPPER);
-+ fprintf(stderr, "%s", MSG_QRSH_STARTER_EMPTY_WRAPPER);
- fprintf(stderr, "\n");
- } else {
- if ((*wrapper = (char *)malloc(strlen(line) - 13 + 1)) == NULL) {
-diff -up GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c.format GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c
---- GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c 2014-10-03 21:11:16.293851448 -0600
-@@ -261,7 +261,7 @@ qrstat_report_finish(qrstat_report_handl
- DENTER(TOP_LAYER, "qrstat_report_finish");
-
- sge_dstring_append(buffer, "</qrstat>\n");
-- printf(sge_dstring_get_string((dstring *)handler->ctx));
-+ printf("%s", sge_dstring_get_string((dstring *)handler->ctx));
-
- DRETURN(ret);
- }
-diff -up GE2011.11p1/source/clients/qsh/parse_job_qsh.c.format GE2011.11p1/source/clients/qsh/parse_job_qsh.c
---- GE2011.11p1/source/clients/qsh/parse_job_qsh.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/qsh/parse_job_qsh.c 2014-10-03 21:11:16.294851472 -0600
-@@ -288,7 +288,7 @@ lList *cull_parse_qsh_parameter(u_long32
- char str[1024];
-
- lRemoveElem(cmdline, &ep);
-- sprintf(str, MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
-+ sprintf(str, "%s", MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
- answer_list_add(&answer, str, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- lFreeList(&path_alias);
- DEXIT;
-diff -up GE2011.11p1/source/clients/qsh/qsh.c.format GE2011.11p1/source/clients/qsh/qsh.c
---- GE2011.11p1/source/clients/qsh/qsh.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/qsh/qsh.c 2014-10-03 21:11:16.294851472 -0600
-@@ -450,7 +450,7 @@ static char *read_from_qrsh_socket(int m
- return NULL;
- } else {
- if (rval == 0) {
-- ERROR((SGE_EVENT, MSG_QSH_ERRORENDINGCONNECTION));
-+ ERROR((SGE_EVENT, "%s", MSG_QSH_ERRORENDINGCONNECTION));
- DEXIT;
- return NULL;
- }
-@@ -501,7 +501,7 @@ static int get_remote_exit_code(int sock
-
- DENTER(TOP_LAYER, "get_remote_exit_code");
-
-- VERBOSE_LOG((stderr, MSG_QSH_READINGEXITCODEFROMSHEPHERD));
-+ VERBOSE_LOG((stderr, "%s", MSG_QSH_READINGEXITCODEFROMSHEPHERD));
-
- msgsock = wait_for_qrsh_socket(sock, QSH_SOCKET_FINAL_TIMEOUT);
- if (msgsock != -1) {
-@@ -518,7 +518,7 @@ static int get_remote_exit_code(int sock
- }
- }
-
-- ERROR((SGE_EVENT, MSG_QSH_ERRORREADINGRETURNCODEOFREMOTECOMMAND));
-+ ERROR((SGE_EVENT, "%s", MSG_QSH_ERRORREADINGRETURNCODEOFREMOTECOMMAND));
- DEXIT;
- return -1;
- }
-@@ -567,7 +567,7 @@ static const char *quote_argument(const
- new_arg = malloc(strlen(arg) + 3);
-
- if (new_arg == NULL) {
-- ERROR((SGE_EVENT, MSG_QSH_MALLOCFAILED));
-+ ERROR((SGE_EVENT, "%s", MSG_QSH_MALLOCFAILED));
- DEXIT;
- return NULL;
- }
-@@ -762,7 +762,7 @@ static int start_client_program(const ch
-
- /* create an argument list */
- if (!sge_sl_create(&sl_args)) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- exit(EXIT_FAILURE);
- }
-
-@@ -1020,7 +1020,7 @@ get_client_name(sge_gdi_ctx_class_t *ctx
- /* get configuration from qmaster */
- if (gdi2_get_configuration(ctx, qualified_hostname, &global, &local) ||
- merge_configuration(NULL, progid, cell_root, global, local, &conf_list)) {
-- ERROR((SGE_EVENT, MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
- lFreeList(&conf_list);
- lFreeElem(&global);
- lFreeElem(&local);
-@@ -1031,7 +1031,7 @@ get_client_name(sge_gdi_ctx_class_t *ctx
- /* search for config entry */
- qlogin_cmd_elem = lGetElemStr(conf_list, CF_name, config_name);
- if (qlogin_cmd_elem == NULL) {
-- ERROR((SGE_EVENT, MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
- lFreeList(&conf_list);
- lFreeElem(&global);
- lFreeElem(&local);
-@@ -2004,7 +2004,7 @@ int main(int argc, char **argv)
- }
- }
-
-- VERBOSE_LOG((stderr, MSG_QSH_WAITINGFORINTERACTIVEJOBTOBESCHEDULED));
-+ VERBOSE_LOG((stderr, "%s", MSG_QSH_WAITINGFORINTERACTIVEJOBTOBESCHEDULED));
-
- DPRINTF(("R E A D I N G J O B ! ! ! ! ! ! ! ! ! ! !\n"));
- DPRINTF(("============================================\n"));
-@@ -2186,7 +2186,7 @@ int main(int argc, char **argv)
-
- do_shut = shut_me_down;
- if (do_shut || do_exit) {
-- WARNING((SGE_EVENT, MSG_QSH_REQUESTFORINTERACTIVEJOBHASBEENCANCELED));
-+ WARNING((SGE_EVENT, "%s", MSG_QSH_REQUESTFORINTERACTIVEJOBHASBEENCANCELED));
- delete_job(ctx, job_id, lp_jobs);
- lFreeList(&lp_poll);
- do_exit = 1;
-@@ -2259,7 +2259,7 @@ int main(int argc, char **argv)
- * so exit qrsh/qlogin with real exit_status.
- */
- if (g_new_interactive_job_support == false) {
-- WARNING((SGE_EVENT, MSG_QSH_CANTSTARTINTERACTIVEJOB));
-+ WARNING((SGE_EVENT, "%s", MSG_QSH_CANTSTARTINTERACTIVEJOB));
- do_exit = 1;
- exit_status = 1;
- } else {
-diff -up GE2011.11p1/source/clients/qstat/qstat.c.format GE2011.11p1/source/clients/qstat/qstat.c
---- GE2011.11p1/source/clients/qstat/qstat.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qstat/qstat.c 2014-10-03 21:11:16.295851495 -0600
-@@ -1697,7 +1697,7 @@ static int qstat_stdout_queue_load_alarm
- {
- DENTER(TOP_LAYER, "qstat_stdout_queue_load_alarm");
- printf("\t");
-- printf(reason);
-+ printf("%s", reason);
- printf("\n");
- DEXIT;
- return 0;
-@@ -1707,7 +1707,7 @@ static int qstat_stdout_queue_suspend_al
- {
- DENTER(TOP_LAYER, "qstat_stdout_queue_suspend_alarm");
- printf("\t");
-- printf(reason);
-+ printf("%s", reason);
- printf("\n");
- DEXIT;
- return 0;
-@@ -1717,7 +1717,7 @@ static int qstat_stdout_queue_message(qs
- {
- DENTER(TOP_LAYER, "qstat_stdout_queue_message");
- printf("\t");
-- printf(message);
-+ printf("%s", message);
- printf("\n");
- DEXIT;
- return 0;
-diff -up GE2011.11p1/source/clients/qstat/qstat_cmdline.c.format GE2011.11p1/source/clients/qstat/qstat_cmdline.c
---- GE2011.11p1/source/clients/qstat/qstat_cmdline.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qstat/qstat_cmdline.c 2014-10-03 21:11:16.295851495 -0600
-@@ -302,7 +302,7 @@ qstat_usage(int qselect_mode, FILE *fp,
- }
-
- if (getenv("MORE_INFO")) {
-- fprintf(fp, MSG_QSTAT_USAGE_ADDITIONALDEBUGGINGOPTIONS);
-+ fprintf(fp, "%s", MSG_QSTAT_USAGE_ADDITIONALDEBUGGINGOPTIONS);
- fprintf(fp, " [-dj] %s\n",MSG_QSTAT_USAGE_DUMPCOMPLETEJOBLISTTOSTDOUT);
- fprintf(fp, " [-dq] %s\n",MSG_QSTAT_USAGE_DUMPCOMPLETEQUEUELISTTOSTDOUT);
- }
-diff -up GE2011.11p1/source/clients/qsub/qsub.c.format GE2011.11p1/source/clients/qsub/qsub.c
---- GE2011.11p1/source/clients/qsub/qsub.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qsub/qsub.c 2014-10-03 21:11:16.296851518 -0600
-@@ -361,7 +361,7 @@ main(int argc, char **argv)
- }
- printf("\n");
- } else {
-- printf(MSG_JOB_VERIFYFOUNDQ);
-+ printf("%s", MSG_JOB_VERIFYFOUNDQ);
- printf("\n");
- }
-
-@@ -702,5 +702,5 @@ static int report_exit_status(int stat,
- *******************************************************************************/
- static void error_handler(const char *message)
- {
-- fprintf(stderr, message);
-+ fprintf(stderr, "%s", message);
- }
-diff -up GE2011.11p1/source/common/parse_job_cull.c.format GE2011.11p1/source/common/parse_job_cull.c
---- GE2011.11p1/source/common/parse_job_cull.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/common/parse_job_cull.c 2014-10-03 21:11:16.296851518 -0600
-@@ -361,7 +361,7 @@ lList *cull_parse_job_parameter(u_long32
-
- if ((ep = lGetElemStr(cmdline, SPA_switch, "-help"))) {
- lRemoveElem(cmdline, &ep);
-- sprintf(error_string, MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
-+ sprintf(error_string, "%s", MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
- answer_list_add(&answer, error_string,
- STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- DRETURN(answer);
-diff -up GE2011.11p1/source/common/parse_qsub.c.format GE2011.11p1/source/common/parse_qsub.c
---- GE2011.11p1/source/common/parse_qsub.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/common/parse_qsub.c 2014-10-03 21:11:16.297851542 -0600
-@@ -1814,7 +1814,7 @@ DTRACE;
-
- sp++;
- if (!*sp) {
-- sprintf(str, MSG_PARSE_ATSIGNOPTIONMUSTHAVEFILEARGUMENT);
-+ sprintf(str, "%s", MSG_PARSE_ATSIGNOPTIONMUSTHAVEFILEARGUMENT);
- answer_list_add(&answer, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return answer;
-diff -up GE2011.11p1/source/daemons/common/admin_mail.c.format GE2011.11p1/source/daemons/common/admin_mail.c
---- GE2011.11p1/source/daemons/common/admin_mail.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/admin_mail.c 2014-10-03 21:11:16.297851542 -0600
-@@ -236,7 +236,7 @@ void job_related_adminmail(u_long32 prog
- sprintf(str_general, MSG_GFSTATE_JOB_U, sge_u32c(jobid));
- }
- else {
-- sprintf(str_general, MSG_NONE);
-+ sprintf(str_general, "%s", MSG_NONE);
- }
- } else {
- /* This is a pe task */
-diff -up GE2011.11p1/source/daemons/common/mail.c.format GE2011.11p1/source/daemons/common/mail.c
---- GE2011.11p1/source/daemons/common/mail.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/mail.c 2014-10-03 21:11:16.297851542 -0600
-@@ -101,7 +101,7 @@ void cull_mail(u_long32 progid, lList *u
- user = lGetString(ep, MR_user);
- host = lGetHost(ep, MR_host);
- if (!user && !host) {
-- ERROR((SGE_EVENT, MSG_MAIL_EMPTYUSERHOST));
-+ ERROR((SGE_EVENT, "%s", MSG_MAIL_EMPTYUSERHOST));
- FREE(mailer);
- DRETURN_VOID;
- } else if (!host) {
-@@ -277,13 +277,13 @@ const char *buf
- alarm(0);
- if (pid2 == 0) { /* how could this happen? */
- kill(pid, SIGKILL);
-- ERROR((SGE_EVENT, MSG_MAIL_NOMAIL1));
-+ ERROR((SGE_EVENT, "%s", MSG_MAIL_NOMAIL1));
- exit(1);
- }
-
- if (pid2 == -1) { /* alarm must have went off */
- kill(pid, SIGKILL);
-- ERROR((SGE_EVENT, MSG_MAIL_NOMAIL2));
-+ ERROR((SGE_EVENT, "%s", MSG_MAIL_NOMAIL2));
- exit(1);
- }
-
-diff -up GE2011.11p1/source/daemons/common/procfs.c.format GE2011.11p1/source/daemons/common/procfs.c
---- GE2011.11p1/source/daemons/common/procfs.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/procfs.c 2014-10-03 21:11:16.298851565 -0600
-@@ -206,7 +206,7 @@ void procfs_kill_addgrpid(gid_t add_grp_
- if (shepherd_trace) {
- char err_str[256];
-
-- sprintf(err_str, MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY );
-+ sprintf(err_str, "%s", MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY );
- shepherd_trace(err_str);
- }
- /*
-@@ -222,7 +222,7 @@ void procfs_kill_addgrpid(gid_t add_grp_
- if (shepherd_trace) {
- char err_str[256];
-
-- sprintf(err_str, MSG_SGE_PROCFSKILLADDGRPIDMALLOCFAILED );
-+ sprintf(err_str, "%s", MSG_SGE_PROCFSKILLADDGRPIDMALLOCFAILED );
- shepherd_trace(err_str);
- }
-
-@@ -416,14 +416,14 @@ time_t last_time
-
- max_groups = sge_sysconf(SGE_SYSCONF_NGROUPS_MAX);
- if (max_groups <= 0) {
-- ERROR((SGE_EVENT, MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY));
-+ ERROR((SGE_EVENT, "%s", MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY));
- DEXIT;
- return 1;
- }
-
- list = (gid_t*) malloc(max_groups*sizeof(gid_t));
- if (list == NULL) {
-- ERROR((SGE_EVENT, MSG_SGE_PTDISPATCHPROCTOJOBMALLOCFAILED));
-+ ERROR((SGE_EVENT, "%s", MSG_SGE_PTDISPATCHPROCTOJOBMALLOCFAILED));
- DEXIT;
- return 1;
- }
-diff -up GE2011.11p1/source/daemons/common/qmaster_heartbeat.c.format GE2011.11p1/source/daemons/common/qmaster_heartbeat.c
---- GE2011.11p1/source/daemons/common/qmaster_heartbeat.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/qmaster_heartbeat.c 2014-10-03 21:11:16.298851565 -0600
-@@ -65,7 +65,7 @@ int get_qmaster_heartbeat( char *file, i
- DENTER(TOP_LAYER, "get_qmaster_heartbeat");
-
- if (file == NULL) {
-- ERROR((SGE_EVENT, MSG_HEART_NO_FILENAME));
-+ ERROR((SGE_EVENT, "%s", MSG_HEART_NO_FILENAME));
- DEXIT;
- return -1;
- }
-@@ -138,7 +138,7 @@ int inc_qmaster_heartbeat(char *file, in
- DENTER(TOP_LAYER, "inc_qmaster_heartbeat");
-
- if (file == NULL) {
-- ERROR((SGE_EVENT, MSG_HEART_NO_FILENAME));
-+ ERROR((SGE_EVENT, "%s", MSG_HEART_NO_FILENAME));
- DEXIT;
- return -1;
- }
-diff -up GE2011.11p1/source/daemons/common/startprog.c.format GE2011.11p1/source/daemons/common/startprog.c
---- GE2011.11p1/source/daemons/common/startprog.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/startprog.c 2014-10-03 21:11:16.298851565 -0600
-@@ -210,7 +210,7 @@ pid_t pid
- else if (WIFSIGNALED(status))
- exit_status = 8;
- else {
-- ERROR((SGE_EVENT, MSG_PROC_WAITPIDRETURNEDUNKNOWNSTATUS));
-+ ERROR((SGE_EVENT, "%s", MSG_PROC_WAITPIDRETURNEDUNKNOWNSTATUS));
- exit_status = 8;
- }
-
-diff -up GE2011.11p1/source/daemons/common/unparse_job_cull.c.format GE2011.11p1/source/daemons/common/unparse_job_cull.c
---- GE2011.11p1/source/daemons/common/unparse_job_cull.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/unparse_job_cull.c 2014-10-03 21:11:16.299851588 -0600
-@@ -176,7 +176,7 @@ int flags
- ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, 0);
- if (ret) {
- DPRINTF(("Error %d formatting jid_request_list as -hold_jid\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJID);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJID);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -194,7 +194,7 @@ int flags
- ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, 0);
- if (ret) {
- DPRINTF(("Error %d formatting ja_ad_request_list as -hold_jid_ad\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJIDAD);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJIDAD);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -230,7 +230,7 @@ int flags
- 0);
- if (ret) {
- DPRINTF(("Error %d formatting job_identifier_list as -jid\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJOBIDENTIFIERLISTASJID);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJOBIDENTIFIERLISTASJID);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -277,7 +277,7 @@ int flags
- cp = sge_unparse_mail_options(ul);
- if (!cp) {
- DPRINTF(("Error unparsing mail options\n"));
-- sprintf(str, MSG_PARSE_ERRORUNPARSINGMAILOPTIONS);
-+ sprintf(str, "%s", MSG_PARSE_ERRORUNPARSINGMAILOPTIONS);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -318,7 +318,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting mail list as -M\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATTINGMAILLISTASM );
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATTINGMAILLISTASM );
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -363,13 +363,13 @@ int flags
-
- prty = ul - BASE_PRIORITY;
- if (prty > 1024) {
-- sprintf(str, MSG_PROC_INVALIDPROIRITYMUSTBELESSTHAN1025);
-+ sprintf(str, "%s", MSG_PROC_INVALIDPROIRITYMUSTBELESSTHAN1025);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DEXIT;
- return answer;
- }
- if (prty < -1023) {
-- sprintf(str, MSG_PROC_INVALIDPRIORITYMUSTBEGREATERTHANMINUS1024);
-+ sprintf(str, "%s", MSG_PROC_INVALIDPRIORITYMUSTBEGREATERTHANMINUS1024);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DEXIT;
- return answer;
-@@ -403,7 +403,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting hard_queue_list as -q\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGHARDQUEUELISTASQ);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGHARDQUEUELISTASQ);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -420,7 +420,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting soft_queue_list as -q\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGSOFTQUEUELISTASQ);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGSOFTQUEUELISTASQ);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -488,7 +488,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting environment list as -v\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGENVIRONMENTLISTASV);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGENVIRONMENTLISTASV);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -527,7 +527,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting job arguments\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJOBARGUMENTS);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJOBARGUMENTS);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -708,7 +708,7 @@ lList **alpp
- ret = centry_list_append_to_string(lp, str, sizeof(str) - 1);
- if (ret) {
- DPRINTF(("Error %d formatting hard_resource_list as -l\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGHARDRESOURCELISTASL);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGHARDRESOURCELISTASL);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return ret;
- }
-@@ -751,7 +751,7 @@ lList **alpp
- sge_dstring_append(&string_buffer, " ");
- if (!(lp = lGetList(job, JB_pe_range))) {
- DPRINTF(("Job has parallel environment with no ranges\n"));
-- sprintf(str, MSG_JOB_JOBHASPEWITHNORANGES);
-+ sprintf(str, "%s", MSG_JOB_JOBHASPEWITHNORANGES);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- sge_dstring_free(&string_buffer);
- DEXIT;
-@@ -767,7 +767,7 @@ lList **alpp
- }
- if (ret) {
- DPRINTF(("Error %d formatting ranges in -pe\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGRANGESINPE);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGRANGESINPE);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- sge_dstring_free(&string_buffer);
- DEXIT;
-@@ -805,7 +805,7 @@ lList **alpp
- ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting path_list\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGPATHLIST);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGPATHLIST);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return ret;
- }
-diff -up GE2011.11p1/source/daemons/execd/dispatcher.c.format GE2011.11p1/source/daemons/execd/dispatcher.c
---- GE2011.11p1/source/daemons/execd/dispatcher.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/dispatcher.c 2014-10-03 21:11:16.299851588 -0600
-@@ -247,7 +247,7 @@ int sge_execd_process_messages(sge_gdi_c
- */
- sge_set_qmrestart_time(now);
- sge_set_delay_job_reports_flag(true);
-- INFO((SGE_EVENT, MSG_EXECD_ENABLEDELEAYDJOBREPORTING));
-+ INFO((SGE_EVENT, "%s", MSG_EXECD_ENABLEDELEAYDJOBREPORTING));
-
- /* after a reconnect, we want to send a full load report - immediately */
- execd_trash_load_report();
-@@ -272,7 +272,7 @@ int sge_execd_process_messages(sge_gdi_c
- if (sge_get_delay_job_reports_flag() && (now - sge_get_qmrestart_time() >= DELAYED_FINISHED_JOB_REPORTING_INTERVAL)) {
- sge_set_delay_job_reports_flag(false);
- sge_set_qmrestart_time(0);
-- INFO((SGE_EVENT, MSG_EXECD_DISABLEDELEAYDJOBREPORTING));
-+ INFO((SGE_EVENT, "%s", MSG_EXECD_DISABLEDELEAYDJOBREPORTING));
- }
-
- if (now - last_alive_check >= alive_check_interval) {
-diff -up GE2011.11p1/source/daemons/execd/execd.c.format GE2011.11p1/source/daemons/execd/execd.c
---- GE2011.11p1/source/daemons/execd/execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/execd.c 2014-10-03 21:11:16.299851588 -0600
-@@ -237,7 +237,7 @@ int main(int argc, char **argv)
- if (printed_points != 0) {
- printf("\n");
- }
-- CRITICAL((SGE_EVENT, MSG_COM_ERROR));
-+ CRITICAL((SGE_EVENT, "%s", MSG_COM_ERROR));
- SGE_EXIT((void**)&ctx, 1);
- }
- if (cl_com_get_handle(prognames[EXECD],1) == NULL) {
-@@ -262,7 +262,7 @@ int main(int argc, char **argv)
- */
- ret_val = cl_com_set_status_func(sge_execd_application_status);
- if (ret_val != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(ret_val)) );
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val)) );
- }
-
- /* test connection */
-@@ -272,8 +272,8 @@ int main(int argc, char **argv)
- (char *)ctx->get_master(ctx, true),
- (char*)prognames[QMASTER], 1, &status);
- if (ret_val != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(ret_val)));
-- ERROR((SGE_EVENT, MSG_CONF_NOCONFBG));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val)));
-+ ERROR((SGE_EVENT, "%s", MSG_CONF_NOCONFBG));
- }
- cl_com_free_sirm_message(&status);
- }
-@@ -339,15 +339,15 @@ int main(int argc, char **argv)
- * Log a warning message if execd hasn't been started by a superuser
- */
- if (!sge_is_start_user_superuser()) {
-- WARNING((SGE_EVENT, MSG_SWITCH_USER_NOT_ROOT));
-+ WARNING((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_ROOT));
- }
-
- #ifdef COMPILE_DC
- if (ptf_init()) {
-- CRITICAL((SGE_EVENT, MSG_EXECD_NOSTARTPTF));
-+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_NOSTARTPTF));
- SGE_EXIT((void**)&ctx, 1);
- }
-- INFO((SGE_EVENT, MSG_EXECD_STARTPDCANDPTF));
-+ INFO((SGE_EVENT, "%s", MSG_EXECD_STARTPDCANDPTF));
- #endif
-
- master_job_list = object_type_get_master_list(SGE_TYPE_JOB);
-@@ -650,7 +650,7 @@ static lList *sge_parse_execd(lList **pp
- }
-
- if(lGetNumberOfElem(*ppcmdline)) {
-- sprintf(str, MSG_PARSE_TOOMANYARGS);
-+ sprintf(str, "%s", MSG_PARSE_TOOMANYARGS);
- if(!usageshowed)
- sge_usage(EXECD, stderr);
- answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
-diff -up GE2011.11p1/source/daemons/execd/execd_job_exec.c.format GE2011.11p1/source/daemons/execd/execd_job_exec.c
---- GE2011.11p1/source/daemons/execd/execd_job_exec.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/execd_job_exec.c 2014-10-03 21:11:16.300851612 -0600
-@@ -97,7 +97,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx
- /* ------- featureset */
- if (unpackint(&(aMsg->buf), &feature_set))
- {
-- ERROR((SGE_EVENT, MSG_COM_UNPACKFEATURESET));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKFEATURESET));
- DRETURN(0);
- }
-
-@@ -117,7 +117,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx
-
- if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &job, JB_Type)) {
- answer_list_output(&answer_list);
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
-
-@@ -161,7 +161,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx
-
- if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &petrep, PETR_Type)) {
- answer_list_output(&answer_list);
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
-
-@@ -198,7 +198,7 @@ int do_job_slave(sge_gdi_ctx_class_t *ct
-
- /* ------- featureset */
- if (unpackint(&(aMsg->buf), &feature_set)) {
-- ERROR((SGE_EVENT, MSG_COM_UNPACKFEATURESET));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKFEATURESET));
- DRETURN(0);
- }
-
-@@ -211,7 +211,7 @@ int do_job_slave(sge_gdi_ctx_class_t *ct
- /* ------- job */
- if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &jelem, JB_Type)) {
- answer_list_output(&answer_list);
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
- lFreeList(&answer_list);
-diff -up GE2011.11p1/source/daemons/execd/execd_ticket.c.format GE2011.11p1/source/daemons/execd/execd_ticket.c
---- GE2011.11p1/source/daemons/execd/execd_ticket.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/execd_ticket.c 2014-10-03 21:11:16.300851612 -0600
-@@ -66,7 +66,7 @@ int do_ticket(sge_gdi_ctx_class_t *ctx,
-
- if (unpackint(&(aMsg->buf), &jobid) || unpackint(&(aMsg->buf), &jataskid)
- || unpackdouble(&(aMsg->buf), &ticket)) {
-- ERROR((SGE_EVENT, MSG_JOB_TICKETFORMAT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_TICKETFORMAT));
- DRETURN(0);
- }
- DPRINTF(("got %lf new tickets for job "sge_u32"."sge_u32"\n", ticket, jobid, jataskid));
-diff -up GE2011.11p1/source/daemons/execd/exec_job.c.format GE2011.11p1/source/daemons/execd/exec_job.c
---- GE2011.11p1/source/daemons/execd/exec_job.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/exec_job.c 2014-10-03 21:11:16.301851635 -0600
-@@ -404,14 +404,14 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- if (!(used_slots=qinstance_slots_used(master_q))) {
- if (!(sge_make_tmpdir(master_q, job_id, ja_task_id,
- pw->pw_uid, pw->pw_gid, tmpdir))) {
-- snprintf(err_str, err_length, MSG_SYSTEM_CANTMAKETMPDIR);
-+ snprintf(err_str, err_length, "%s", MSG_SYSTEM_CANTMAKETMPDIR);
- DEXIT;
- return -2;
- }
- } else {
- SGE_STRUCT_STAT statbuf;
- if(!(sge_get_tmpdir(master_q, job_id, ja_task_id, tmpdir))) {
-- snprintf(err_str, err_length, MSG_SYSTEM_CANTGETTMPDIR);
-+ snprintf(err_str, err_length, "%s", MSG_SYSTEM_CANTGETTMPDIR);
- DEXIT;
- return -2;
- }
-@@ -1037,7 +1037,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- FREE(gid_range);
- if (rlp == NULL) {
- lFreeList(&alp);
-- snprintf(err_str, err_length, MSG_EXECD_NOPARSEGIDRANGE);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOPARSEGIDRANGE);
- lFreeList(&environmentList);
- FCLOSE(fp);
- DEXIT;
-@@ -1050,7 +1050,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- while (addgrpid_already_in_use(last_addgrpid)) {
- last_addgrpid = get_next_addgrpid (rlp, last_addgrpid);
- if (temp_id == last_addgrpid) {
-- snprintf(err_str, err_length, MSG_EXECD_NOADDGID);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOADDGID);
- lFreeList(&environmentList);
- FCLOSE(fp);
- DEXIT;
-@@ -1426,7 +1426,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- fprintf(fp, "exec_file=%s\n", xterm);
- DPRINTF(("exec_file=%s\n", xterm));
- } else {
-- snprintf(err_str, err_length, MSG_EXECD_NOXTERM);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOXTERM);
- FCLOSE(fp);
- lFreeList(&environmentList);
- sge_dstring_free(&core_binding_strategy_string);
-@@ -1498,7 +1498,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- */
- const char *error_string = lGetString(lFirst(answer_list), AN_text);
- if(error_string != NULL) {
-- snprintf(err_str, err_length, error_string);
-+ snprintf(err_str, err_length, "%s", error_string);
- }
- lFreeList(&answer_list);
- lFreeList(&environmentList);
-@@ -1747,7 +1747,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- set_token_cmd = mconf_get_set_token_cmd();
- if (!set_token_cmd ||
- !strlen(set_token_cmd) || !mconf_get_token_extend_time()) {
-- snprintf(err_str, err_length, MSG_EXECD_AFSCONFINCOMPLETE);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_AFSCONFINCOMPLETE);
- FREE(pag_cmd);
- FREE(shepherd_cmd);
- DEXIT;
-@@ -1767,7 +1767,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
-
- cp = lGetString(jep, JB_tgt);
- if (!cp || !(len = strlen(cp))) {
-- snprintf(err_str, err_length, MSG_EXECD_TOKENZERO);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_TOKENZERO);
- FREE(pag_cmd);
- FREE(shepherd_cmd);
- DEXIT;
-@@ -1990,7 +1990,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- }
-
- FCLOSE_ERROR:
-- CRITICAL((SGE_EVENT, MSG_EXECD_NOSTARTSHEPHERD));
-+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_NOSTARTSHEPHERD));
-
- exit(1);
-
-diff -up GE2011.11p1/source/daemons/execd/job_report_execd.c.format GE2011.11p1/source/daemons/execd/job_report_execd.c
---- GE2011.11p1/source/daemons/execd/job_report_execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/job_report_execd.c 2014-10-03 21:11:16.301851635 -0600
-@@ -103,7 +103,7 @@ lListElem *add_job_report(u_long32 jobid
- jr_list = lCreateList("job report list", JR_Type);
-
- if (jr_list == NULL || (jr=lCreateElem(JR_Type)) == NULL) {
-- ERROR((SGE_EVENT, MSG_JOB_TYPEMALLOC));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_TYPEMALLOC));
- DRETURN(NULL);
- }
-
-@@ -278,7 +278,7 @@ int do_ack(sge_gdi_ctx_class_t *ctx, str
- while (pb_unused(&(aMsg->buf)) > 0) {
-
- if (cull_unpack_elem(&(aMsg->buf), &ack, NULL)) {
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
-
-@@ -355,7 +355,7 @@ int do_ack(sge_gdi_ctx_class_t *ctx, str
- break;
-
- default:
-- ERROR((SGE_EVENT, MSG_COM_ACK_UNKNOWN1));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_ACK_UNKNOWN1));
- break;
- }
-
-diff -up GE2011.11p1/source/daemons/execd/load_avg.c.format GE2011.11p1/source/daemons/execd/load_avg.c
---- GE2011.11p1/source/daemons/execd/load_avg.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/load_avg.c 2014-10-03 21:11:16.302851658 -0600
-@@ -719,7 +719,7 @@ static int sge_get_loadavg(const char* q
-
- now = sge_get_gmt();
- if (now >= next_log) {
-- WARNING((SGE_EVENT, MSG_SGETEXT_NO_LOAD));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_NO_LOAD));
- next_log = now + 7200;
- }
- } else if (loads == -2) {
-@@ -774,7 +774,7 @@ static int sge_get_loadavg(const char* q
- if (sge_loadmem(&mem_info)) {
- static int mem_fail = 0;
- if (!mem_fail) {
-- ERROR((SGE_EVENT, MSG_LOAD_NOMEMINDICES));
-+ ERROR((SGE_EVENT, "%s", MSG_LOAD_NOMEMINDICES));
- mem_fail =1;
- }
- DRETURN(1);
-@@ -916,7 +916,7 @@ static int sge_get_loadavg(const char* q
-
- u_long32 now = sge_get_gmt();
- if (now >= next_log2) {
-- WARNING((SGE_EVENT, MSG_SGETEXT_NO_LOAD));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_NO_LOAD));
- next_log2 = now + 7200;
- }
- }
-diff -up GE2011.11p1/source/daemons/execd/ptf.c.format GE2011.11p1/source/daemons/execd/ptf.c
---- GE2011.11p1/source/daemons/execd/ptf.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/ptf.c 2014-10-03 21:11:16.302851658 -0600
-@@ -825,7 +825,7 @@ static lListElem *ptf_get_job_os(lList *
- #endif
-
- if (!where) {
-- CRITICAL((SGE_EVENT, MSG_WHERE_FAILEDTOBUILDWHERECONDITION));
-+ CRITICAL((SGE_EVENT, "%s", MSG_WHERE_FAILEDTOBUILDWHERECONDITION));
- DRETURN(NULL);
- }
-
-diff -up GE2011.11p1/source/daemons/execd/reaper_execd.c.format GE2011.11p1/source/daemons/execd/reaper_execd.c
---- GE2011.11p1/source/daemons/execd/reaper_execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/reaper_execd.c 2014-10-03 21:11:16.303851682 -0600
-@@ -420,7 +420,7 @@ static int clean_up_job(lListElem *jr, i
- sge_dstring_init(&id_dstring, id_buffer, MAX_STRING_SIZE);
-
- if (!jr) {
-- CRITICAL((SGE_EVENT, MSG_JOB_CLEANUPJOBCALLEDWITHINVALIDPARAMETERS));
-+ CRITICAL((SGE_EVENT, "%s", MSG_JOB_CLEANUPJOBCALLEDWITHINVALIDPARAMETERS));
- DEXIT;
- return -1;
- }
-@@ -511,7 +511,7 @@ static int clean_up_job(lListElem *jr, i
-
- sprintf(error, MSG_STATUS_ABNORMALTERMINATIONOFSHEPHERDFORJOBXY_S,
- job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
-- ERROR((SGE_EVENT, error));
-+ ERROR((SGE_EVENT, "%s", error));
-
- /*
- * failed = ESSTATE_SHEPHERD_EXIT or exit status of shepherd if we are
-@@ -525,7 +525,7 @@ static int clean_up_job(lListElem *jr, i
- if (fscanf_count != 1) {
- sprintf(error, MSG_STATUS_ABNORMALTERMINATIONFOSHEPHERDFORJOBXYEXITSTATEFILEISEMPTY_S,
- job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
-- ERROR((SGE_EVENT, error));
-+ ERROR((SGE_EVENT, "%s", error));
- /*
- * If shepherd died through signal assume job was started, else
- * trust exit status
-@@ -553,9 +553,9 @@ static int clean_up_job(lListElem *jr, i
-
- if (failed) {
- if (failed == ESSTATE_DIED_THRU_SIGNAL)
-- sprintf(error, MSG_SHEPHERD_DIEDTHROUGHSIGNAL);
-+ sprintf(error, "%s", MSG_SHEPHERD_DIEDTHROUGHSIGNAL);
- else if (failed == ESSTATE_NO_PID)
-- sprintf(error, MSG_SHEPHERD_NOPIDFILE);
-+ sprintf(error, "%s", MSG_SHEPHERD_NOPIDFILE);
- else
- sprintf(error, MSG_SHEPHERD_EXITEDWISSTATUS_IS, failed,
- get_sstate_description(failed));
-@@ -605,7 +605,7 @@ static int clean_up_job(lListElem *jr, i
- job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
- }
-
-- ERROR((SGE_EVENT, error));
-+ ERROR((SGE_EVENT, "%s", error));
-
- if (!failed) {
- failed = SSTATE_FAILURE_AFTER_JOB;
-@@ -640,7 +640,7 @@ static int clean_up_job(lListElem *jr, i
- if (!failed) {
- failed = SSTATE_FAILURE_AFTER_JOB;
- if (!*error)
-- sprintf(error, MSG_JOB_CANTREADUSEDRESOURCESFORJOB);
-+ sprintf(error, "%s", MSG_JOB_CANTREADUSEDRESOURCESFORJOB);
- }
- }
- }
-@@ -1218,7 +1218,7 @@ int clean_up_old_jobs(sge_gdi_ctx_class_
- DENTER(TOP_LAYER, "clean_up_old_jobs");
-
- if (startup) {
-- INFO((SGE_EVENT, MSG_SHEPHERD_CKECKINGFOROLDJOBS));
-+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_CKECKINGFOROLDJOBS));
- }
-
- /*
-@@ -1243,9 +1243,9 @@ int clean_up_old_jobs(sge_gdi_ctx_class_
- !lost_children) {
- if (lost_children) {
- if (startup) {
-- INFO((SGE_EVENT, MSG_SHEPHERD_NOOLDJOBSATSTARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_NOOLDJOBSATSTARTUP));
- } else {
-- INFO((SGE_EVENT, MSG_SHEPHERD_NOMOREOLDJOBSAFTERSTARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_NOMOREOLDJOBSAFTERSTARTUP));
- }
- /*
- * Now setting lost_children to 0 which disables further pid checking
-@@ -1261,7 +1261,7 @@ int clean_up_old_jobs(sge_gdi_ctx_class_
- /* Get pids of running jobs. So we can look for running shepherds. */
- npids = sge_get_pids(pids, 10000, SGE_SHEPHERD, PSCMD);
- if (npids == -1) {
-- ERROR((SGE_EVENT, MSG_SHEPHERD_CANTGETPROCESSESFROMPSCOMMAND));
-+ ERROR((SGE_EVENT, "%s", MSG_SHEPHERD_CANTGETPROCESSESFROMPSCOMMAND));
- DEXIT;
- return -1;
- }
-@@ -1451,7 +1451,7 @@ examine_job_task_from_file(sge_gdi_ctx_c
-
- if (startup)
- {
-- INFO((SGE_EVENT, err_str));
-+ INFO((SGE_EVENT, "%s", err_str));
- modify_queue_limits_flag_for_job(ctx->get_qualified_hostname(ctx), jep, true);
- }
- else
-diff -up GE2011.11p1/source/daemons/execd/setup_execd.c.format GE2011.11p1/source/daemons/execd/setup_execd.c
---- GE2011.11p1/source/daemons/execd/setup_execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/setup_execd.c 2014-10-03 21:11:16.303851682 -0600
-@@ -88,20 +88,20 @@ void sge_setup_sge_execd(sge_gdi_ctx_cla
- ** switch to admin user
- */
- if (sge_set_admin_username(admin_user, err_str)) {
-- CRITICAL((SGE_EVENT, err_str));
-+ CRITICAL((SGE_EVENT, "%s", err_str));
- /* TODO: remove */
- SGE_EXIT(NULL, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER));
- /* TODO: remove */
- SGE_EXIT(NULL, 1);
- }
-
- while (gdi2_wait_for_conf(ctx, &Execd_Config_List)) {
- if (allowed_get_conf_errors-- <= 0) {
-- CRITICAL((SGE_EVENT, MSG_EXECD_CANT_GET_CONFIGURATION_EXIT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_CANT_GET_CONFIGURATION_EXIT));
- /* TODO: remove */
- SGE_EXIT(NULL, 1);
- }
-diff -up GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c.format GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c 2014-10-03 21:11:16.304851705 -0600
-@@ -167,7 +167,7 @@ int sge_read_configuration(sge_gdi_ctx_c
- }
-
- if ((global = sge_get_configuration_for_host(SGE_GLOBAL_NAME)) == NULL) {
-- ERROR((SGE_EVENT, MSG_CONFIG_NOGLOBAL));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_NOGLOBAL));
- DRETURN(-1);
- }
-
-@@ -371,7 +371,7 @@ int sge_mod_configuration(sge_gdi_ctx_cl
- }
-
- if ((global = sge_get_configuration_for_host(SGE_GLOBAL_NAME)) == NULL) {
-- ERROR((SGE_EVENT, MSG_CONFIG_NOGLOBAL));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_NOGLOBAL));
- }
-
- if (merge_configuration(&answer_list, progid, cell_root, global, local, NULL) != 0) {
-diff -up GE2011.11p1/source/daemons/qmaster/job_exit.c.format GE2011.11p1/source/daemons/qmaster/job_exit.c
---- GE2011.11p1/source/daemons/qmaster/job_exit.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/job_exit.c 2014-10-03 21:11:16.304851705 -0600
-@@ -326,7 +326,7 @@ void sge_job_exit(sge_gdi_ctx_class_t *c
-
- sge_dstring_sprintf(&error, MSG_LOG_QERRORBYJOBHOST_SUS, lGetString(qinstance, QU_qname), sge_u32c(jobid), host);
- qinstance_message_add(qinstance, QI_ERROR, sge_dstring_get_string(&error));
-- ERROR((SGE_EVENT, sge_dstring_get_string(&error)));
-+ ERROR((SGE_EVENT, "%s", sge_dstring_get_string(&error)));
- sge_event_spool(ctx, &answer_list, 0, sgeE_QINSTANCE_MOD,
- 0, 0, lGetString(qinstance, QU_qname),
- lGetHost(qinstance, QU_qhostname), NULL,
-@@ -350,7 +350,7 @@ void sge_job_exit(sge_gdi_ctx_class_t *c
- /* general error -> this queue cant run any job */
- sge_qmaster_qinstance_state_set_error(queueep, true);
- qinstance_message_add(queueep, QI_ERROR, sge_dstring_get_string(&error));
-- ERROR((SGE_EVENT, sge_dstring_get_string(&error)));
-+ ERROR((SGE_EVENT, "%s", sge_dstring_get_string(&error)));
- sge_event_spool(ctx, &answer_list, 0, sgeE_QINSTANCE_MOD,
- 0, 0, lGetString(queueep, QU_qname),
- lGetHost(queueep, QU_qhostname), NULL,
-diff -up GE2011.11p1/source/daemons/qmaster/reschedule.c.format GE2011.11p1/source/daemons/qmaster/reschedule.c
---- GE2011.11p1/source/daemons/qmaster/reschedule.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/reschedule.c 2014-10-03 21:11:16.304851705 -0600
-@@ -333,10 +333,10 @@ int reschedule_job(sge_gdi_ctx_class_t *
- if (job_is_array(jep)) {
- sprintf(mail_ids, sge_U32CFormat"."sge_U32CFormat,
- sge_u32c(job_number), sge_u32c(task_number));
-- sprintf(mail_type, MSG_RU_TYPEJOBARRAY);
-+ sprintf(mail_type, "%s", MSG_RU_TYPEJOBARRAY);
- } else {
- sprintf(mail_ids, sge_U32CFormat, sge_u32c(job_number));
-- sprintf(mail_type, MSG_RU_TYPEJOB);
-+ sprintf(mail_type, "%s", MSG_RU_TYPEJOB);
- }
-
- granted_qs = lGetList(this_jatep, JAT_granted_destin_identifier_list);
-@@ -531,9 +531,9 @@ int reschedule_job(sge_gdi_ctx_class_t *
-
- mail_options = lGetUlong(jep, JB_mail_options);
- if (force) {
-- sprintf(mail_action, MSG_RU_FORCEDR);
-+ sprintf(mail_action, "%s", MSG_RU_FORCEDR);
- } else {
-- sprintf(mail_action, MSG_RU_PUSHEDR);
-+ sprintf(mail_action, "%s", MSG_RU_PUSHEDR);
- }
- if (VALID(MAIL_AT_ABORT, mail_options)) {
- lList *mail_users;
-diff -up GE2011.11p1/source/daemons/qmaster/setup_qmaster.c.format GE2011.11p1/source/daemons/qmaster/setup_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/setup_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/setup_qmaster.c 2014-10-03 21:11:16.305851728 -0600
-@@ -179,7 +179,7 @@ int sge_setup_qmaster(sge_gdi_ctx_class_
-
- process_cmdline(anArgv);
-
-- INFO((SGE_EVENT, MSG_STARTUP_BEGINWITHSTARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_STARTUP_BEGINWITHSTARTUP));
-
- qmaster_unlock(QMASTER_LOCK_FILE);
-
-@@ -245,12 +245,12 @@ sge_qmaster_thread_init(sge_gdi_ctx_clas
- if (switch_to_admin_user == true) {
- char str[1024];
- if (sge_set_admin_username(admin_user, str) == -1) {
-- CRITICAL((SGE_EVENT, str));
-+ CRITICAL((SGE_EVENT, "%s", str));
- SGE_EXIT((void**)ctx_ref, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER));
- SGE_EXIT((void**)ctx_ref, 1);
- }
- }
-@@ -520,7 +520,7 @@ static lList *parse_qmaster(lList **ppcm
- }
-
- if(lGetNumberOfElem(*ppcmdline)) {
-- sprintf(str, MSG_PARSE_TOOMANYOPTIONS);
-+ sprintf(str, "%s", MSG_PARSE_TOOMANYOPTIONS);
- if(!usageshowed)
- sge_usage(QMASTER, stderr);
- answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
-@@ -557,7 +557,7 @@ static void qmaster_init(sge_gdi_ctx_cla
- DENTER(TOP_LAYER, "qmaster_init");
-
- if (setup_qmaster(ctx)) {
-- CRITICAL((SGE_EVENT, MSG_STARTUP_SETUPFAILED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_STARTUP_SETUPFAILED));
- SGE_EXIT(NULL, 1);
- }
-
-@@ -809,7 +809,7 @@ static void qmaster_lock_and_shutdown(vo
-
- if (anExitValue == 0) {
- if (qmaster_lock(QMASTER_LOCK_FILE) == -1) {
-- CRITICAL((SGE_EVENT, MSG_QMASTER_LOCKFILE_ALREADY_EXISTS));
-+ CRITICAL((SGE_EVENT, "%s", MSG_QMASTER_LOCKFILE_ALREADY_EXISTS));
- }
- }
- sge_gdi2_shutdown(ctx_ref);
-@@ -837,7 +837,7 @@ static int setup_qmaster(sge_gdi_ctx_cla
- if (first) {
- first = false;
- } else {
-- CRITICAL((SGE_EVENT, MSG_SETUP_SETUPMAYBECALLEDONLYATSTARTUP));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SETUP_SETUPMAYBECALLEDONLYATSTARTUP));
- DEXIT;
- return -1;
- }
-@@ -942,14 +942,14 @@ static int setup_qmaster(sge_gdi_ctx_cla
- if (!host_list_locate(*object_base[SGE_TYPE_EXECHOST].list, SGE_TEMPLATE_NAME)) {
- /* add an exec host "template" */
- if (sge_add_host_of_type(ctx, SGE_TEMPLATE_NAME, SGE_EH_LIST, &monitor))
-- ERROR((SGE_EVENT, MSG_CONFIG_ADDINGHOSTTEMPLATETOEXECHOSTLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_ADDINGHOSTTEMPLATETOEXECHOSTLIST));
- }
-
- /* add host "global" to Master_Exechost_List as an exec host */
- if (!host_list_locate(*object_base[SGE_TYPE_EXECHOST].list, SGE_GLOBAL_NAME)) {
- /* add an exec host "global" */
- if (sge_add_host_of_type(ctx, SGE_GLOBAL_NAME, SGE_EH_LIST, &monitor))
-- ERROR((SGE_EVENT, MSG_CONFIG_ADDINGHOSTGLOBALTOEXECHOSTLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_ADDINGHOSTGLOBALTOEXECHOSTLIST));
- }
-
- /* add qmaster host to Master_Adminhost_List as an administrativ host */
-@@ -967,7 +967,7 @@ static int setup_qmaster(sge_gdi_ctx_cla
-
- if (!spool_write_object(&answer_list, spooling_context, ep, "root", SGE_TYPE_MANAGER, job_spooling)) {
- answer_list_output(&answer_list);
-- CRITICAL((SGE_EVENT, MSG_CONFIG_CANTWRITEMANAGERLIST));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CONFIG_CANTWRITEMANAGERLIST));
- DRETURN(-1);
- }
- }
-@@ -987,7 +987,7 @@ static int setup_qmaster(sge_gdi_ctx_cla
-
- if (!spool_write_object(&answer_list, spooling_context, ep, "root", SGE_TYPE_OPERATOR, job_spooling)) {
- answer_list_output(&answer_list);
-- CRITICAL((SGE_EVENT, MSG_CONFIG_CANTWRITEOPERATORLIST));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CONFIG_CANTWRITEOPERATORLIST));
- DEXIT;
- return -1;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c.format GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c
---- GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c 2014-10-03 21:11:16.306851752 -0600
-@@ -320,7 +320,7 @@ sge_c_gdi(sge_gdi_ctx_class_t *ctx, sge_
- sge_gdi_packet_pack_task(packet, task, answer_list, pb);
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_UNKNOWNOP));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_UNKNOWNOP));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP,
- ANSWER_QUALITY_ERROR);
- sge_gdi_packet_pack_task(packet, task, answer_list, pb);
-@@ -357,7 +357,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- case SGE_EV_LIST:
- task->data_list = sge_select_event_clients("", task->condition, task->enumeration);
- task->do_select_pack_simultaneous = false;
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- DEXIT;
- return;
-@@ -371,7 +371,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
-
- task->data_list = lSelectHashPack("", conf, task->condition, task->enumeration, false, NULL);
- task->do_select_pack_simultaneous = false;
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- lFreeList(&conf);
- }
-@@ -386,7 +386,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- conf = sconf_get_config_list();
- task->data_list = lSelectHashPack("", conf, task->condition, task->enumeration, false, NULL);
- task->do_select_pack_simultaneous = false;
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- lFreeList(&conf);
- }
-@@ -404,7 +404,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- answer_list_add(&(task->answer_list),MSG_SGETEXT_JOBINFOMESSAGESOUTDATED,
- STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- } else if (ao == NULL || ao->list_type == SGE_TYPE_NONE) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- } else {
- lList *data_source = *object_type_get_master_list(ao->list_type);
-@@ -420,7 +420,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- * 05/21/2007 qualitiy was ANSWER_QUALITY_INFO but this results in "ok"
- * messages on qconf side
- */
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
-
- } else {
-@@ -567,7 +567,7 @@ sge_c_gdi_add(sge_gdi_ctx_class_t *ctx,
-
- default:
- if (!ao) {
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -656,7 +656,7 @@ sge_c_gdi_del(sge_gdi_ctx_class_t *ctx,
- packet->user, packet->host);
- break;
- default:
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -733,7 +733,7 @@ sge_c_gdi_del(sge_gdi_ctx_class_t *ctx,
- ar_del(ctx, ep, &(task->answer_list), object_base[SGE_TYPE_AR].list, packet->user, packet->host, monitor);
- break;
- default:
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- } /* switch target */
-@@ -788,7 +788,7 @@ static void sge_c_gdi_copy(sge_gdi_ctx_c
- break;
-
- default:
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -876,7 +876,7 @@ static void sge_gdi_do_permcheck(sge_gdi
- }
- }
-
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- DEXIT;
- return;
-@@ -895,7 +895,7 @@ sge_c_gdi_permcheck(sge_gdi_packet_class
- sge_gdi_do_permcheck(packet, task);
- break;
- default:
-- WARNING((SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- }
- DRETURN_VOID;
-@@ -941,7 +941,7 @@ void sge_c_gdi_replace(sge_gdi_ctx_class
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -1000,7 +1000,7 @@ sge_c_gdi_trigger(sge_gdi_ctx_class_t *c
- default:
- /* permissions should be checked in the functions. Here we don't
- know what is to do, so we don't know what permissions we need */
-- WARNING((SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -1231,13 +1231,13 @@ trigger_scheduler_monitoring(sge_gdi_pac
- DENTER(GDI_LAYER, "trigger_scheduler_monitoring");
-
- if (!manop_is_manager(packet->user)) {
-- WARNING((SGE_EVENT, MSG_COM_NOSCHEDMONPERMS));
-+ WARNING((SGE_EVENT, "%s", MSG_COM_NOSCHEDMONPERMS));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_WARNING);
- DEXIT;
- return;
- }
- if (!sge_add_event_for_client(EV_ID_SCHEDD, 0, sgeE_SCHEDDMONITOR, 0, 0, NULL, NULL, NULL, NULL)) {
-- WARNING((SGE_EVENT, MSG_COM_NOSCHEDDREGMASTER));
-+ WARNING((SGE_EVENT, "%s", MSG_COM_NOSCHEDDREGMASTER));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_WARNING);
- DEXIT;
- return;
-@@ -1311,7 +1311,7 @@ static void sge_c_gdi_mod(sge_gdi_ctx_cl
- break;
- default:
- if (ao == NULL) {
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -1422,7 +1422,7 @@ static int sge_chck_mod_perm_user(lList
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(alpp, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- DRETURN(1);
- }
-@@ -1526,7 +1526,7 @@ int sge_chck_mod_perm_host(lList **alpp,
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(alpp, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- DRETURN(1);
- }
-@@ -1595,7 +1595,7 @@ sge_task_check_get_perm_host(sge_gdi_pac
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- ret = false;
- return ret;
-@@ -1711,7 +1711,7 @@ monitoring_t *monitor
- if (!(new_obj = (add
- ? lCreateElem(object->type)
- : lCopyElem(old_obj)))) {
-- ERROR((SGE_EVENT, MSG_MEM_MALLOC));
-+ ERROR((SGE_EVENT, "%s", MSG_MEM_MALLOC));
- answer_list_add(alpp, SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EEXIST);
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c 2014-10-03 21:11:16.306851752 -0600
-@@ -640,7 +640,7 @@ int cqueue_mod(sge_gdi_ctx_class_t *ctx,
- const char *old_name = lGetString(cqueue, CQ_name);
-
- if (strcmp(old_name, name)) {
-- ERROR((SGE_EVENT, MSG_CQUEUE_NONAMECHANGE));
-+ ERROR((SGE_EVENT, "%s", MSG_CQUEUE_NONAMECHANGE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
- ret = false;
-@@ -932,7 +932,7 @@ int cqueue_del(sge_gdi_ctx_class_t *ctx,
- */
- for_each(qinstance, qinstances) {
- if (qinstance_slots_used(qinstance) > 0 || qinstance_slots_reserved(qinstance) > 0) {
-- ERROR((SGE_EVENT, MSG_QINSTANCE_STILLJOBS));
-+ ERROR((SGE_EVENT, "%s", MSG_QINSTANCE_STILLJOBS));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EEXIST,
- ANSWER_QUALITY_ERROR);
- do_del = false;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_follow.c.format GE2011.11p1/source/daemons/qmaster/sge_follow.c
---- GE2011.11p1/source/daemons/qmaster/sge_follow.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_follow.c 2014-10-03 21:11:16.307851775 -0600
-@@ -196,7 +196,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if (!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(-2);
- }
-@@ -305,7 +305,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
- * find and check queue
- */
- if (!q_name) {
-- ERROR((SGE_EVENT, MSG_OBJ_NOQNAME));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJ_NOQNAME));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- lFreeList(&gdil);
- lSetString(jatp, JAT_granted_pe, NULL);
-@@ -534,7 +534,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number = lGetUlong(ep, OR_job_number);
- if (job_number == 0) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(-2);
- }
-@@ -639,7 +639,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if (!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(-2);
- }
-@@ -759,7 +759,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if(!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DEXIT;
- return -2;
-@@ -961,7 +961,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if(!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DEXIT;
- return -2;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c 2014-10-03 21:11:16.307851775 -0600
-@@ -256,7 +256,7 @@ hgroup_mod(sge_gdi_ctx_class_t *ctx,
- } else {
- lListElem *aep;
- for_each(aep, *answer_list) {
-- ERROR((SGE_EVENT, lGetString(aep, AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(aep, AN_text)));
- }
- ret = false;
- }
-@@ -266,7 +266,7 @@ hgroup_mod(sge_gdi_ctx_class_t *ctx,
-
- /* Reject modify requests which try to change the groupname */
- if (sge_hostcmp(old_name, name)) {
-- ERROR((SGE_EVENT, MSG_HGRP_NONAMECHANGE));
-+ ERROR((SGE_EVENT, "%s", MSG_HGRP_NONAMECHANGE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c 2014-10-03 21:11:16.308851798 -0600
-@@ -392,7 +392,7 @@ int sge_del_host(sge_gdi_ctx_class_t *ct
- }
- else if (!strcasecmp(unique, "global"))
- {
-- ERROR((SGE_EVENT, MSG_OBJ_DELGLOBALHOST));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJ_DELGLOBALHOST));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return STATUS_ESEMANTIC;
-@@ -1025,7 +1025,7 @@ void sge_gdi_kill_exechost(sge_gdi_ctx_c
- DENTER(GDI_LAYER, "sge_gdi_kill_exechost");
-
- if (!manop_is_manager(packet->user)) {
-- ERROR((SGE_EVENT, MSG_OBJ_SHUTDOWNPERMS));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJ_SHUTDOWNPERMS));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR,
- ANSWER_QUALITY_ERROR);
- DEXIT;
-@@ -1074,7 +1074,7 @@ sge_gdi_ctx_class_t *ctx, sge_gdi_packet
- if (lGetNumberOfElem(task->answer_list) == 0) {
- /* no exechosts have been killed */
- DPRINTF((MSG_SGETEXT_NOEXECHOSTS));
-- INFO((SGE_EVENT, MSG_SGETEXT_NOEXECHOSTS));
-+ INFO((SGE_EVENT, "%s", MSG_SGETEXT_NOEXECHOSTS));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_INFO);
- }
- } else {
-diff -up GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c 2014-10-03 21:11:16.309851822 -0600
-@@ -655,7 +655,7 @@ u_long32 step
- DENTER(TOP_LAYER, "empty_job_list_filter");
-
- if (all_users_flag) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_THEREARENOJOBS));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_THEREARENOJOBS));
- } else if (user_list_flag) {
- dstring user_list_string = DSTRING_INIT;
-
-@@ -716,7 +716,7 @@ u_long32 step
- }
- } else {
- /* Should not be possible */
-- ERROR((SGE_EVENT,
-+ ERROR((SGE_EVENT, "%s",
- was_modify?MSG_SGETEXT_NOJOBSMODIFIED:MSG_SGETEXT_NOJOBSDELETED));
- }
-
-@@ -834,7 +834,7 @@ char *ruser
- /* case 9 */
-
- if (all_users_flag && user_list_flag) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_SPECIFYONEORALLUSER));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_SPECIFYONEORALLUSER));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2531,7 +2531,7 @@ int *trigger)
-
- /* reject PE ranges change requests for jobs without PE request */
- if (!(pe_name=lGetString(new_job, JB_pe))) {
-- ERROR((SGE_EVENT, MSG_JOB_PERANGE_ONLY_FOR_PARALLEL));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_PERANGE_ONLY_FOR_PARALLEL));
- answer_list_add(alpp, SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2875,7 +2875,7 @@ int job_verify_predecessors(lListElem *j
- predecessors_req = lGetList(job, JB_jid_request_list);
- predecessors_id = lCreateList("job_predecessors", JRE_Type);
- if (!predecessors_id) {
-- ERROR((SGE_EVENT, MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2980,7 +2980,7 @@ int job_verify_predecessors_ad(lListElem
- predecessors_req = lGetList(job, JB_ja_ad_request_list);
- predecessors_id = lCreateList("job_predecessors_ad", JRE_Type);
- if (!predecessors_id) {
-- ERROR((SGE_EVENT, MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2991,7 +2991,7 @@ int job_verify_predecessors_ad(lListElem
- if (!job_is_array(job)) {
- lFreeList(&predecessors_id);
- DPRINTF(("could not create array dependence for non-array job\n"));
-- ERROR((SGE_EVENT, MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -3068,7 +3068,7 @@ int job_verify_predecessors_ad(lListElem
- if (!job_is_array(pred_job)) {
- lFreeList(&predecessors_id);
- DPRINTF(("could not create array dependence on non-array job\n"));
-- ERROR((SGE_EVENT, MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -3076,7 +3076,7 @@ int job_verify_predecessors_ad(lListElem
- if (!sge_task_depend_is_same_range(pred_job, job)) {
- lFreeList(&predecessors_id);
- DPRINTF(("could not create array dependence for jobs with different sub-task range\n"));
-- ERROR((SGE_EVENT, MSG_JOB_MOD_ARRAYJOBMUSTHAVESAMERANGEWITHADOPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_ARRAYJOBMUSTHAVESAMERANGEWITHADOPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -3444,7 +3444,7 @@ int verify_suitable_queues(lList **alpp,
- *trigger |= VERIFY_EVENT;
- }
- if (!a.pe) {
-- sprintf(SGE_EVENT, MSG_JOB_VERIFYFOUNDQ);
-+ sprintf(SGE_EVENT, "%s", MSG_JOB_VERIFYFOUNDQ);
- } else {
- sprintf(SGE_EVENT, MSG_JOB_VERIFYFOUNDSLOTS_I, a.slots);
- }
-@@ -4209,7 +4209,7 @@ job_verify_project(const lListElem *job,
- * every job *must* request a project
- */
- if (lGetNumberOfElem(projects) > 0) {
-- ERROR((SGE_EVENT, MSG_JOB_PRJREQUIRED));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_PRJREQUIRED));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = STATUS_EUNKNOWN;
- }
-@@ -4218,7 +4218,7 @@ job_verify_project(const lListElem *job,
- char* enforce_project = mconf_get_enforce_project();
-
- if (enforce_project != NULL && strcasecmp(enforce_project, "true") == 0) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_NO_PROJECT));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NO_PROJECT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = STATUS_EUNKNOWN;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_job_verify.c.format GE2011.11p1/source/daemons/qmaster/sge_job_verify.c
---- GE2011.11p1/source/daemons/qmaster/sge_job_verify.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_job_verify.c 2014-10-03 21:11:16.309851822 -0600
-@@ -169,7 +169,7 @@ int sge_job_verify_adjust(sge_gdi_ctx_cl
- if (ret == STATUS_OK) {
- if ((!JOB_TYPE_IS_BINARY(lGetUlong(jep, JB_type)) &&
- !lGetString(jep, JB_script_ptr) && lGetString(jep, JB_script_file))) {
-- ERROR((SGE_EVENT, MSG_JOB_NOSCRIPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOSCRIPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = STATUS_EUNKNOWN;
- }
-@@ -661,7 +661,7 @@ int sge_job_verify_adjust(sge_gdi_ctx_cl
- */
- if (lGetUlong(jep, JB_priority) > BASE_PRIORITY && !manop_is_operator(ruser))
- {
-- ERROR((SGE_EVENT, MSG_JOB_NONADMINPRIO));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NONADMINPRIO));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c 2014-10-03 21:11:16.310851845 -0600
-@@ -212,7 +212,7 @@ int pe_mod(sge_gdi_ctx_class_t *ctx, lLi
- /* -------- PE_resource_utilization */
- if (add) {
- if (pe_set_slots_used(new_pe, 0)) {
-- ERROR((SGE_EVENT, MSG_MEM_MALLOC));
-+ ERROR((SGE_EVENT, "%s", MSG_MEM_MALLOC));
- answer_list_add(alpp, SGE_EVENT, STATUS_EMALLOC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return STATUS_EMALLOC;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c 2014-10-03 21:11:16.310851845 -0600
-@@ -153,9 +153,9 @@ increment_heartbeat(sge_gdi_ctx_class_t
- if ( getuniquehostname(act_qmaster_name, act_resolved_qmaster_name, 0) == CL_RETVAL_OK &&
- sge_hostcmp(act_resolved_qmaster_name, qualified_hostname) != 0 ) {
- /* act_qmaster file has been changed */
-- WARNING((SGE_EVENT, MSG_HEART_ACT_QMASTER_FILE_CHANGED));
-+ WARNING((SGE_EVENT, "%s", MSG_HEART_ACT_QMASTER_FILE_CHANGED));
- if (sge_qmaster_shutdown_via_signal_thread(100) != 0) {
-- ERROR((SGE_EVENT, MSG_HEART_CANT_SIGNAL));
-+ ERROR((SGE_EVENT, "%s", MSG_HEART_CANT_SIGNAL));
- /* TODO: here the ctx reference is not transported back
- ** event_handler functions should use &ctx instead
- */
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c 2014-10-03 21:11:16.310851845 -0600
-@@ -327,7 +327,7 @@ int main(int argc, char* argv[])
- max_enroll_tries--;
- if (max_enroll_tries <= 0) {
- /* exit after 30 seconds */
-- CRITICAL((SGE_EVENT, MSG_QMASTER_COMMUNICATION_ERRORS ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_QMASTER_COMMUNICATION_ERRORS ));
- SGE_EXIT((void**)&ctx, 1);
- }
- if (cl_com_get_handle(prognames[QMASTER],1) == NULL) {
-@@ -343,7 +343,7 @@ int main(int argc, char* argv[])
- */
- ret_val = cl_com_set_status_func(sge_qmaster_application_status);
- if (ret_val != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(ret_val)));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val)));
- }
-
- /*
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c 2014-10-03 21:11:16.311851868 -0600
-@@ -321,7 +321,7 @@ do_report_request(sge_gdi_ctx_class_t *c
- }
-
- if (cull_unpack_list(&(aMsg->buf), &rep)) {
-- ERROR((SGE_EVENT,MSG_CULL_FAILEDINCULLUNPACKLISTREPORT));
-+ ERROR((SGE_EVENT, "%s", MSG_CULL_FAILEDINCULLUNPACKLISTREPORT));
- DRETURN_VOID;
- }
-
-@@ -571,7 +571,7 @@ static void sge_c_job_ack(sge_gdi_ctx_cl
- }
-
- default:
-- ERROR((SGE_EVENT, MSG_COM_ACK_UNKNOWN));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_ACK_UNKNOWN));
- }
- DRETURN_VOID;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c 2014-10-03 21:11:16.311851868 -0600
-@@ -104,7 +104,7 @@ void sge_gdi_kill_master(sge_gdi_packet_
-
- if (sge_gdi_packet_parse_auth_info(packet, &(task->answer_list), &uid, username, sizeof(username),
- &gid, groupname, sizeof(groupname)) == -1) {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- DEXIT;
- return;
-@@ -113,7 +113,7 @@ void sge_gdi_kill_master(sge_gdi_packet_
- DPRINTF(("uid/username = %d/%s, gid/groupname = %d/%s\n", (int) uid, username, (int) gid, groupname));
-
- if (!manop_is_manager(username)) {
-- ERROR((SGE_EVENT, MSG_SHUTDOWN_SHUTTINGDOWNQMASTERREQUIRESMANAGERPRIVILEGES));
-+ ERROR((SGE_EVENT, "%s", MSG_SHUTDOWN_SHUTTINGDOWNQMASTERREQUIRESMANAGERPRIVILEGES));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- DEXIT;
- return;
-@@ -249,12 +249,12 @@ void sge_become_admin_user(const char *a
- DENTER(TOP_LAYER, "sge_become_admin_user");
-
- if (sge_set_admin_username(admin_user, str) == -1) {
-- CRITICAL((SGE_EVENT, str));
-+ CRITICAL((SGE_EVENT, "%s", str));
- SGE_EXIT(NULL, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER));
- SGE_EXIT(NULL, 1);
- }
-
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c 2014-10-03 21:11:16.311851868 -0600
-@@ -656,7 +656,7 @@ monitoring_t *monitor
- DPRINTF(("cleaning queue >%s<\n", qname ));
-
- if (!manop_is_manager(user)) {
-- ERROR((SGE_EVENT, MSG_QUEUE_NOCLEANQPERMS));
-+ ERROR((SGE_EVENT, "%s", MSG_QUEUE_NOCLEANQPERMS));
- answer_list_add(answer, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return -1;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c 2014-10-03 21:11:16.312851892 -0600
-@@ -168,7 +168,7 @@ int rqs_mod(sge_gdi_ctx_class_t *ctx,
- attr_mod_sub_list(alpp, new_rule, RQR_limit, RQRL_name, rule,
- sub_command, SGE_ATTR_RQSRULES, SGE_OBJ_RQS, 0);
- } else {
-- ERROR((SGE_EVENT, MSG_RESOURCEQUOTA_NORULEDEFINED));
-+ ERROR((SGE_EVENT, "%s", MSG_RESOURCEQUOTA_NORULEDEFINED));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- goto ERROR;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c.format GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c
---- GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c 2014-10-03 21:11:16.312851892 -0600
-@@ -399,7 +399,7 @@ ensure_valid_what_and_where(sge_where_wh
- where_what->what_queue == NULL || where_what->where_queue2 == NULL ||
- where_what->what_queue2 == NULL || where_what->where_all_queue == NULL ||
- where_what->what_pe == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SCHEDD_UNABLE_TO_SETUP_FILTER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SCHEDD_UNABLE_TO_SETUP_FILTER));
- }
- /* cleanup tmp data */
- if (tmp_what_descr != NULL)
-diff -up GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c 2014-10-03 21:11:16.313851915 -0600
-@@ -287,13 +287,13 @@ static int dept_is_valid_defaultdepartme
- if (dept != NULL) {
- /* test 'type' */
- if (!(lGetUlong(dept, US_type) & US_DEPT)) {
-- ERROR((SGE_EVENT, MSG_QMASTER_DEPTFORDEFDEPARTMENT));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_DEPTFORDEFDEPARTMENT));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
- /* test user list */
- if (lGetNumberOfElem(lGetList(dept, US_entries)) > 0 ) {
-- ERROR((SGE_EVENT, MSG_QMASTER_AUTODEFDEPARTMENT));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_AUTODEFDEPARTMENT));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
-@@ -327,12 +327,12 @@ static int acl_is_valid_acl(lListElem *a
- if (acl != NULL) {
- if (!(lGetUlong(acl, US_type) & US_DEPT)) {
- if (lGetUlong(acl, US_fshare) > 0) {
-- ERROR((SGE_EVENT, MSG_QMASTER_ACLNOSHARE));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_ACLNOSHARE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
- if (lGetUlong(acl, US_oticket) > 0) {
-- ERROR((SGE_EVENT, MSG_QMASTER_ACLNOTICKET));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_ACLNOTICKET));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c 2014-10-03 21:11:16.313851915 -0600
-@@ -547,7 +547,7 @@ bool attr_mod_sub_list(lList **alpp, lLi
- }
-
- if (rstring == NULL || fstring == NULL) {
-- ERROR((SGE_EVENT, MSG_OBJECT_VALUEMISSING));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJECT_VALUEMISSING));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- ret = false;
-@@ -618,7 +618,7 @@ bool attr_mod_sub_list(lList **alpp, lLi
- }
-
- if (rstring == NULL) {
-- ERROR((SGE_EVENT, MSG_OBJECT_VALUEMISSING));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJECT_VALUEMISSING));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/daemons/shadowd/shadowd.c.format GE2011.11p1/source/daemons/shadowd/shadowd.c
---- GE2011.11p1/source/daemons/shadowd/shadowd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/shadowd/shadowd.c 2014-10-03 21:11:16.313851915 -0600
-@@ -125,7 +125,7 @@ static int shadowd_is_old_master_enrolle
-
- handle=cl_com_create_handle(&commlib_error, CL_CT_TCP, CL_CM_CT_MESSAGE, CL_FALSE, sge_qmaster_port, CL_TCP_DEFAULT,(char*)prognames[SHADOWD] , 0, 1,0 );
- if (handle == NULL) {
-- CRITICAL((SGE_EVENT,cl_get_error_text(commlib_error)));
-+ CRITICAL((SGE_EVENT, "%s", cl_get_error_text(commlib_error)));
- DRETURN(is_up_and_running);
- }
-
-@@ -284,12 +284,12 @@ char qmaster_out_file[SGE_PATH_MAX];
- }
-
- if (sge_set_admin_username(ctx->get_admin_user(ctx), err_str)) {
-- CRITICAL((SGE_EVENT, err_str));
-+ CRITICAL((SGE_EVENT, "%s", err_str));
- SGE_EXIT((void**)&ctx, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_SHADOWD_CANTSWITCHTOADMIN_USER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SHADOWD_CANTSWITCHTOADMIN_USER));
- SGE_EXIT((void**)&ctx, 1);
- }
-
-@@ -365,7 +365,7 @@ char qmaster_out_file[SGE_PATH_MAX];
- if (ret == 0) {
- /* we can start a qmaster on this host */
- if (qmaster_lock(QMASTER_LOCK_FILE)) {
-- ERROR((SGE_EVENT, MSG_SHADOWD_FAILEDTOLOCKQMASTERSOMBODYWASFASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_SHADOWD_FAILEDTOLOCKQMASTERSOMBODYWASFASTER));
- } else {
- int out, err;
-
-@@ -402,7 +402,7 @@ char qmaster_out_file[SGE_PATH_MAX];
- ret = startprog(out, err, NULL, binpath, qmaster_name, NULL);
- sge_switch2admin_user();
- if (ret) {
-- ERROR((SGE_EVENT, MSG_SHADOWD_CANTSTARTQMASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_SHADOWD_CANTSTARTQMASTER));
- }
- close(out);
- } else {
-@@ -533,7 +533,7 @@ static int check_if_valid_shadow(char *b
- DRETURN(-1);
- }
-
-- sprintf(binpath, binary_path); /* copy global configuration path */
-+ sprintf(binpath, "%s", binary_path); /* copy global configuration path */
- DPRINTF((""SFQ"\n", binpath));
- DPRINTF(("we are a candidate for shadow master\n"));
-
-diff -up GE2011.11p1/source/libs/comm/cl_communication.c.format GE2011.11p1/source/libs/comm/cl_communication.c
---- GE2011.11p1/source/libs/comm/cl_communication.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/comm/cl_communication.c 2014-10-03 21:11:16.315851962 -0600
-@@ -3728,7 +3728,7 @@ int cl_com_connection_complete_request(c
- if ( cm_message->dst->comp_host != NULL ) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_CANT_RESOLVE_DESTINATION_HOST_S, cm_message->dst->comp_host );
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, retval , tmp_buffer );
- unique_host = strdup("(HOST_NOT_RESOLVABLE)");
-@@ -3745,7 +3745,7 @@ int cl_com_connection_complete_request(c
- if ( cm_message->dst->comp_host != NULL && unique_host != NULL ) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_REMOTE_DESTINATION_HOSTNAME_X_NOT_Y_SS, cm_message->dst->comp_host, unique_host);
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer );
-
-@@ -3789,7 +3789,7 @@ int cl_com_connection_complete_request(c
- if (cm_message->rdata->comp_host != NULL) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_CANT_RESOLVE_RDATA_HOST_S , cm_message->rdata->comp_host);
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_RDATA_HOST);
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_RDATA_HOST);
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, retval , tmp_buffer );
- unique_host = strdup("(HOST_NOT_RESOLVABLE)");
-@@ -3810,7 +3810,7 @@ int cl_com_connection_complete_request(c
- if ( cm_message->rdata->comp_host != NULL && unique_host != NULL ) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_REMOTE_RDATA_HOSTNAME_X_NOT_Y_SS, cm_message->rdata->comp_host, unique_host);
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_RDATA_HOST );
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_RDATA_HOST );
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer );
-
-@@ -3949,9 +3949,9 @@ int cl_com_connection_complete_request(c
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_IP_ADDRESS_RESOLVING_X_NOT_Y_SS, connection->client_host_name, connection->remote->comp_host );
- } else {
- if (connection->client_host_name == NULL) {
-- snprintf(tmp_buffer,256, MSG_CL_TCP_FW_CANT_RESOLVE_CLIENT_IP );
-+ snprintf(tmp_buffer,256, "%s", MSG_CL_TCP_FW_CANT_RESOLVE_CLIENT_IP );
- } else {
-- snprintf(tmp_buffer,256, MSG_CL_TCP_FW_EMPTY_REMOTE_HOST );
-+ snprintf(tmp_buffer,256, "%s", MSG_CL_TCP_FW_EMPTY_REMOTE_HOST );
- }
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer );
-diff -up GE2011.11p1/source/libs/comm/cl_ssl_framework.c.format GE2011.11p1/source/libs/comm/cl_ssl_framework.c
---- GE2011.11p1/source/libs/comm/cl_ssl_framework.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/comm/cl_ssl_framework.c 2014-10-03 21:11:16.512856557 -0600
-@@ -1071,9 +1071,9 @@ static int cl_com_ssl_build_symbol_table
-
- #elif defined(FREEBSD)
- #ifdef RTLD_NODELETE
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
- #else
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_GLOBAL);
- #endif /* RTLD_NODELETE */
-
- #elif defined(HPUX)
-@@ -1085,9 +1085,9 @@ static int cl_com_ssl_build_symbol_table
-
- #else
- #ifdef RTLD_NODELETE
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_NODELETE);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_NODELETE);
- #else
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY);
- #endif /* RTLD_NODELETE */
- #endif
-
-@@ -2020,7 +2020,7 @@ static int cl_com_ssl_transform_ssl_erro
- if (buffer_copy == NULL) {
- return CL_RETVAL_MALLOC;
- }
-- snprintf(buffer_copy, buflen, buffer);
-+ snprintf(buffer_copy, buflen, "%s", buffer);
-
- help = strtok_r(buffer_copy, ":", &lasts);
- if (help != NULL) {
-@@ -2066,7 +2066,7 @@ static int cl_com_ssl_transform_ssl_erro
- free(module);
- return CL_RETVAL_MALLOC;
- }
-- snprintf(error_text, buflen, buffer);
-+ snprintf(error_text, buflen, "%s", buffer);
- }
-
-
-@@ -2153,11 +2153,11 @@ static int cl_com_ssl_log_ssl_errors(con
- ret_val = cl_com_ssl_transform_ssl_error(ssl_error,buffer,512, &transformed_ssl_error);
-
- if (transformed_ssl_error != NULL) {
-- snprintf(help_buf, 1024, transformed_ssl_error);
-+ snprintf(help_buf, 1024, "%s", transformed_ssl_error);
- free(transformed_ssl_error);
- transformed_ssl_error = NULL;
- } else {
-- snprintf(help_buf, 1024, buffer);
-+ snprintf(help_buf, 1024, "%s", buffer);
- }
-
- if (ret_val != CL_RETVAL_DO_IGNORE) {
-@@ -3087,7 +3087,7 @@ int cl_com_ssl_connection_complete_accep
- if (connection->client_host_name != NULL) {
- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR_S, connection->client_host_name);
- } else {
-- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR);
-+ snprintf(tmp_buffer,1024, "%s", MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR);
- }
-
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_SSL_ACCEPT_HANDSHAKE_TIMEOUT, tmp_buffer);
-@@ -3102,7 +3102,7 @@ int cl_com_ssl_connection_complete_accep
- if (connection->client_host_name != NULL) {
- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_ERROR_S, connection->client_host_name);
- } else {
-- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_ERROR);
-+ snprintf(tmp_buffer,1024, "%s", MSG_CL_COMMLIB_SSL_ACCEPT_ERROR);
- }
-
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_SSL_ACCEPT_ERROR, tmp_buffer);
-diff -up GE2011.11p1/source/libs/cull/cull_file.c.format GE2011.11p1/source/libs/cull/cull_file.c
---- GE2011.11p1/source/libs/cull/cull_file.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/cull/cull_file.c 2014-10-03 21:11:16.317852008 -0600
-@@ -91,7 +91,7 @@ int lWriteElemToDisk(const lListElem *ep
-
- if (!prefix && !name)
- {
-- ERROR((SGE_EVENT, MSG_CULL_NOPREFIXANDNOFILENAMEINWRITEELMTODISK ));
-+ ERROR((SGE_EVENT, "%s", MSG_CULL_NOPREFIXANDNOFILENAMEINWRITEELMTODISK ));
- DEXIT;
- return 1;
- }
-@@ -210,7 +210,7 @@ lListElem *lReadElemFromDisk(const char
-
- if (!prefix && !name)
- {
-- ERROR((SGE_EVENT, MSG_CULL_NOPREFIXANDNOFILENAMEINREADELEMFROMDISK ));
-+ ERROR((SGE_EVENT, "%s", MSG_CULL_NOPREFIXANDNOFILENAMEINREADELEMFROMDISK ));
- DEXIT;
- return NULL;
- }
-@@ -242,7 +242,7 @@ lListElem *lReadElemFromDisk(const char
- size = statbuf.st_size;
- if (((SGE_OFF_T)size != statbuf.st_size) || !(buf = malloc(statbuf.st_size)))
- {
-- CRITICAL((SGE_EVENT, MSG_CULL_LEMALLOC));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_LEMALLOC));
- DEXIT;
- return NULL;
- }
-diff -up GE2011.11p1/source/libs/cull/cull_multitype.c.format GE2011.11p1/source/libs/cull/cull_multitype.c
---- GE2011.11p1/source/libs/cull/cull_multitype.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/cull/cull_multitype.c 2014-10-03 21:11:16.318852032 -0600
-@@ -102,8 +102,8 @@ int incompatibleType2(const char *fmt,..
- vsprintf(buf, fmt, ap);
- va_end(ap);
-
-- CRITICAL((SGE_EVENT, buf));
-- fprintf(stderr, buf);
-+ CRITICAL((SGE_EVENT, "%s", buf));
-+ fprintf(stderr, "%s", buf);
-
- abort();
- DEXIT;
-@@ -751,7 +751,7 @@ lUlong lGetPosUlong(const lListElem *ep,
- if (pos < 0) {
- /* someone has called lGetPosUlong() */
- /* makro with an invalid nm */
-- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSULONG_GOTINVALIDPOSITION ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSULONG_GOTINVALIDPOSITION ));
- DEXIT;
- abort();
- }
-@@ -994,7 +994,7 @@ lListElem *lGetPosObject(const lListElem
- if (pos < 0) {
- /* someone has called lGetPosUlong() */
- /* makro with an invalid nm */
-- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSOBJECT_GOTANINVALIDPOS ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSOBJECT_GOTANINVALIDPOS ));
- DEXIT;
- abort();
- }
-@@ -1031,7 +1031,7 @@ lList *lGetPosList(const lListElem *ep,
- if (pos < 0) {
- /* someone has called lGetPosUlong() */
- /* makro with an invalid nm */
-- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSLIST_GOTANINVALIDPOS ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSLIST_GOTANINVALIDPOS ));
- DEXIT;
- abort();
- }
-diff -up GE2011.11p1/source/libs/evc/sge_event_client.c.format GE2011.11p1/source/libs/evc/sge_event_client.c
---- GE2011.11p1/source/libs/evc/sge_event_client.c.format 2012-05-23 13:04:44.000000000 -0600
-+++ GE2011.11p1/source/libs/evc/sge_event_client.c 2014-10-03 21:11:16.320852078 -0600
-@@ -1085,7 +1085,7 @@ static int ec2_set_edtime(sge_evc_class_
- DENTER(EVC_LAYER, "ec2_set_edtime");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- ret = (lGetUlong(sge_evc->ec, EV_d_time) != interval);
- if (ret > 0) {
-@@ -1124,7 +1124,7 @@ static int ec2_get_edtime(sge_evc_class_
- DENTER(EVC_LAYER, "ec2_get_edtime");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- interval = lGetUlong(sge_evc->ec, EV_d_time);
- }
-@@ -1166,7 +1166,7 @@ static bool ec2_set_flush_delay(sge_evc_
- DENTER(EVC_LAYER, "ec2_set_flush_delay");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- ret = (lGetUlong(sge_evc->ec, EV_flush_delay) != flush_delay) ? true : false;
-
-@@ -1207,7 +1207,7 @@ static int ec2_get_flush_delay(sge_evc_c
- DENTER(EVC_LAYER, "ec2_get_flush_delay");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- flush_delay = lGetUlong(sge_evc->ec, EV_flush_delay);
- }
-@@ -1256,7 +1256,7 @@ static bool ec2_set_busy_handling(sge_ev
- DENTER(EVC_LAYER, "ec2_set_busy_handling");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- DPRINTF(("EVC: change event client to "sge_U32CFormat"\n", (u_long32)handling));
-
-@@ -1299,7 +1299,7 @@ static ev_busy_handling ec2_get_busy_han
- DENTER(EVC_LAYER, "ec2_get_busy_handling");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- handling = (ev_busy_handling)lGetUlong(sge_evc->ec, EV_busy_handling);
- }
-@@ -1318,7 +1318,7 @@ static bool ec2_deregister_local(sge_evc
-
- /* not yet initialized? Nothing to shutdown */
- if (sge_evc == NULL || sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- local_t *evc_local = &(thiz->ec_local);
- u_long32 id = sge_evc->ec_reg_id;
-@@ -1390,7 +1390,7 @@ ec2_register_local(sge_evc_class_t *thiz
- DPRINTF(("trying to register as internal client with preset %d (0 means EV_ID_ANY)\n", (int)sge_evc->ec_reg_id));
-
- if (sge_evc->ec == NULL) {
-- WARNING((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ WARNING((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- ret = false;
- } else {
- lList *alp = NULL;
-@@ -1493,7 +1493,7 @@ static bool ec2_register(sge_evc_class_t
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- WARNING((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ WARNING((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- lList *lp, *alp;
- lListElem *aep;
-@@ -1728,7 +1728,7 @@ static bool ec2_subscribe(sge_evc_class_
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1758,7 +1758,7 @@ static void ec2_add_subscriptionElement(
- DENTER(EVC_LAYER, "ec2_add_subscriptionElement");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1796,7 +1796,7 @@ static void ec2_mod_subscription_flush(s
- DENTER(EVC_LAYER, "ec2_mod_subscription_flush");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1851,7 +1851,7 @@ static bool ec2_mod_subscription_where(s
- DENTER(EVC_LAYER, "ec2_mod_subscription_where");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event <= sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1882,7 +1882,7 @@ static void ec2_remove_subscriptionEleme
- DENTER(EVC_LAYER, "ec2_remove_subscriptionElement");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1981,7 +1981,7 @@ static bool ec2_unsubscribe(sge_evc_clas
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event ));
- } else {
-@@ -1996,7 +1996,7 @@ static bool ec2_unsubscribe(sge_evc_clas
-
- } else {
- if (event == sgeE_QMASTER_GOES_DOWN || event == sgeE_SHUTDOWN || event == sgeE_ACK_TIMEOUT) {
-- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS));
- } else {
- ec2_remove_subscriptionElement(thiz, event);
- }
-@@ -2083,14 +2083,14 @@ static int ec2_get_flush(sge_evc_class_t
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event ));
- } else {
- lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event);
-
- if (sub_event == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (lGetBool(sub_event, EVS_flush)) {
- ret = lGetUlong(sub_event, EVS_interval);
- }
-@@ -2144,7 +2144,7 @@ static bool ec2_set_flush(sge_evc_class_
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event ));
- } else {
-@@ -2159,7 +2159,7 @@ static bool ec2_set_flush(sge_evc_class_
- lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event);
-
- if (sub_event == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- }
- else {
- ec2_mod_subscription_flush(thiz, event, EV_FLUSHED, interval);
-@@ -2212,14 +2212,14 @@ static bool ec2_unset_flush(sge_evc_clas
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
- lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event);
-
- if (sub_event == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- }
- else {
- ec2_mod_subscription_flush(thiz, event, EV_NOT_FLUSHED, EV_NO_FLUSH);
-@@ -2318,7 +2318,7 @@ static bool ec2_set_busy(sge_evc_class_t
- DENTER(EVC_LAYER, "ec2_set_busy");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- lSetUlong(sge_evc->ec, EV_busy, busy);
- ret = true;
-@@ -2360,7 +2360,7 @@ static bool ec2_get_busy(sge_evc_class_t
- DENTER(EVC_LAYER, "ec2_get_busy");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- /* JG: TODO: EV_busy should be boolean datatype */
- ret = (lGetUlong(sge_evc->ec, EV_busy) > 0) ? true : false;
-@@ -2398,7 +2398,7 @@ static bool ec2_set_session(sge_evc_clas
- DENTER(EVC_LAYER, "ec2_set_session");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- lSetString(sge_evc->ec, EV_session, session);
-
-@@ -2436,7 +2436,7 @@ static const char *ec2_get_session(sge_e
- DENTER(EVC_LAYER, "ec2_get_session");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- ret = lGetString(sge_evc->ec, EV_session);
- }
-@@ -2463,7 +2463,7 @@ static ev_registration_id ec2_get_id(sge
-
- DENTER(EVC_LAYER, "ec2_get_id");
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- DRETURN(EV_ID_INVALID);
- }
-
-@@ -2512,7 +2512,7 @@ static bool ec2_commit_local(sge_evc_cla
-
- /* not yet initialized? Cannot send modification to qmaster! */
- if (sge_evc->ec == NULL) {
-- DPRINTF((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ DPRINTF((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (thiz->ec_need_new_registration(thiz)) {
- /* not (yet) registered? Cannot send modification to qmaster! */
- DPRINTF((MSG_EVENT_NOTREGISTERED));
-@@ -2790,7 +2790,7 @@ static bool ec2_get(sge_evc_class_t *thi
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- ret = false;
- } else if (thiz->ec_need_new_registration(thiz)) {
- sge_evc->next_event = 1;
-@@ -2937,7 +2937,7 @@ static bool ec2_get(sge_evc_class_t *thi
- lGetUlong(sge_evc->ec, EV_id), NULL, &alp)
- != CL_RETVAL_OK) {
- answer_list_output(&alp);
-- WARNING((SGE_EVENT, MSG_COMMD_FAILEDTOSENDACKEVENTDELIVERY ));
-+ WARNING((SGE_EVENT, "%s", MSG_COMMD_FAILEDTOSENDACKEVENTDELIVERY ));
- } else {
- DPRINTF(("Sent ack for all events lower or equal %d\n",
- (sge_evc->next_event - 1)));
-@@ -3075,7 +3075,7 @@ static bool ck_event_number(lList *lp, u
- do not change waiting_for because
- we still wait for this number
- */
-- ERROR((SGE_EVENT, MSG_EVENT_EVENTSWITHNOINCREASINGNUMBERS ));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_EVENTSWITHNOINCREASINGNUMBERS ));
- if (wrong_number) {
- *wrong_number = j;
- }
-@@ -3152,7 +3152,7 @@ static bool get_event_list(sge_evc_class
- ret = false;
- } else {
- if (cull_unpack_list(&pb, report_list)) {
-- ERROR((SGE_EVENT, MSG_LIST_FAILEDINCULLUNPACKREPORT ));
-+ ERROR((SGE_EVENT, "%s", MSG_LIST_FAILEDINCULLUNPACKREPORT ));
- ret = false;
- }
- clear_packbuffer(&pb);
-diff -up GE2011.11p1/source/libs/evm/sge_event_master.c.format GE2011.11p1/source/libs/evm/sge_event_master.c
---- GE2011.11p1/source/libs/evm/sge_event_master.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/evm/sge_event_master.c 2014-10-03 21:11:16.321852102 -0600
-@@ -458,7 +458,7 @@ int sge_add_event_client(lListElem *clio
-
- /* check event client object structure */
- if (lCompListDescr(lGetElemDescr(clio), EV_Type) != 0) {
-- ERROR((SGE_EVENT, MSG_EVE_INCOMPLETEEVENTCLIENT));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_INCOMPLETEEVENTCLIENT));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_DENIED);
- }
-@@ -471,7 +471,7 @@ int sge_add_event_client(lListElem *clio
- }
-
- if (lGetBool(clio, EV_changed) && lGetList(clio, EV_subscribed) == NULL) {
-- ERROR((SGE_EVENT, MSG_EVE_INVALIDSUBSCRIPTION));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_INVALIDSUBSCRIPTION));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
- }
-@@ -481,7 +481,7 @@ int sge_add_event_client(lListElem *clio
-
- if (Event_Master_Control.is_prepare_shutdown) {
- sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex);
-- ERROR((SGE_EVENT, MSG_EVE_QMASTERISGOINGDOWN));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_QMASTERISGOINGDOWN));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
- }
-@@ -525,7 +525,7 @@ int sge_add_event_client(lListElem *clio
- */
- if (update_func == NULL && !manop_is_manager(ruser)) {
- sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex);
-- ERROR((SGE_EVENT, MSG_WRONG_USER_FORFIXEDID ));
-+ ERROR((SGE_EVENT, "%s", MSG_WRONG_USER_FORFIXEDID ));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
- }
-@@ -728,7 +728,7 @@ sge_event_master_process_mod_event_clien
- if (lGetBool(clio, EV_changed) && lGetList(clio, EV_subscribed) == NULL) {
- sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex);
- SGE_UNLOCK(LOCK_GLOBAL, LOCK_READ);
-- ERROR((SGE_EVENT, MSG_EVE_INVALIDSUBSCRIPTION));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_INVALIDSUBSCRIPTION));
- DRETURN_VOID;
- }
-
-@@ -1142,7 +1142,7 @@ int sge_shutdown_event_client(u_long32 e
-
- /* Print out a message about the event. */
- if (event_client_id == EV_ID_SCHEDD) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_COM_KILLED_SCHEDULER));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_COM_KILLED_SCHEDULER));
- } else {
- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_COM_SHUTDOWNNOTIFICATION_SUS,
- lGetString(client, EV_name),
-diff -up GE2011.11p1/source/libs/gdi/qm_name.c.format GE2011.11p1/source/libs/gdi/qm_name.c
---- GE2011.11p1/source/libs/gdi/qm_name.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/qm_name.c 2014-10-03 21:11:16.321852102 -0600
-@@ -74,7 +74,7 @@ char *err_str
- if (!master_host || !master_file) {
- if (err_str) {
- if (master_host) {
-- sprintf(err_str, MSG_GDI_NULLPOINTERPASSED );
-+ sprintf(err_str, "%s", MSG_GDI_NULLPOINTERPASSED );
- }
- }
- DRETURN(-1);
-diff -up GE2011.11p1/source/libs/gdi/sge_gdi2.c.format GE2011.11p1/source/libs/gdi/sge_gdi2.c
---- GE2011.11p1/source/libs/gdi/sge_gdi2.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_gdi2.c 2014-10-03 21:11:16.322852125 -0600
-@@ -662,7 +662,7 @@ sge_gdi2_get_any_request(sge_gdi_ctx_cla
- }
-
- if (!rhost) {
-- ERROR((SGE_EVENT, MSG_GDI_RHOSTISNULLFORGETANYREQUEST ));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_RHOSTISNULLFORGETANYREQUEST ));
- PROF_STOP_MEASUREMENT(SGE_PROF_GDI);
- DRETURN(-1);
- }
-@@ -1212,7 +1212,7 @@ gdi2_send_message(sge_gdi_ctx_class_t *s
- if (handle == NULL)
- {
- ERROR((SGE_EVENT, MSG_GDI_CANT_CREATE_HANDLE_TOEXECD_S, tocomproc));
-- ERROR((SGE_EVENT, cl_get_error_text(commlib_error)));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(commlib_error)));
- }
- }
- }
-@@ -1327,7 +1327,7 @@ gdi2_receive_message(sge_gdi_ctx_class_t
- if (handle == NULL)
- {
- ERROR((SGE_EVENT, MSG_GDI_CANT_CREATE_HANDLE_TOEXECD_S, fromcommproc));
-- ERROR((SGE_EVENT, cl_get_error_text(commlib_error)));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(commlib_error)));
- }
- }
- }
-@@ -1482,7 +1482,7 @@ lListElem **lepp
- }
-
- if (!is_global_requested && !lepp) {
-- ERROR((SGE_EVENT, MSG_NULLPOINTER));
-+ ERROR((SGE_EVENT, "%s", MSG_NULLPOINTER));
- lFreeElem(&hep);
- DRETURN(-3);
- }
-@@ -1523,7 +1523,7 @@ lListElem **lepp
- }
-
- if (!(*gepp = lGetElemHost(lp, CONF_name, SGE_GLOBAL_NAME))) {
-- ERROR((SGE_EVENT, MSG_CONF_NOGLOBAL));
-+ ERROR((SGE_EVENT, "%s", MSG_CONF_NOGLOBAL));
- lFreeList(&lp);
- lFreeElem(&hep);
- DRETURN(-5);
-@@ -1764,12 +1764,12 @@ int report_list_send(sge_gdi_ctx_class_t
- DRETURN(-2);
-
- case PACK_FORMAT:
-- ERROR((SGE_EVENT, MSG_GDI_REPORTFORMATERROR));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_REPORTFORMATERROR));
- clear_packbuffer(&pb);
- DRETURN(-3);
-
- default:
-- ERROR((SGE_EVENT, MSG_GDI_REPORTUNKNOWERROR));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_REPORTUNKNOWERROR));
- clear_packbuffer(&pb);
- DRETURN(-1);
- }
-diff -up GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c.format GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c
---- GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c 2014-10-03 21:11:16.323852148 -0600
-@@ -898,7 +898,7 @@ static int sge_gdi_ctx_class_prepare_enr
- case SCHEDD:
- case EXECD:
- {
-- INFO((SGE_EVENT,MSG_GDI_MULTI_THREADED_STARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_GDI_MULTI_THREADED_STARTUP));
- /* if SGE_DEBUG_LEVEL environment is set we use gdi log flush function */
- /* you can set commlib debug level with env SGE_COMMLIB_DEBUG */
- if (env_sge_commlib_debug != NULL) {
-@@ -911,7 +911,7 @@ static int sge_gdi_ctx_class_prepare_enr
- break;
- default:
- {
-- INFO((SGE_EVENT,MSG_GDI_SINGLE_THREADED_STARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_GDI_SINGLE_THREADED_STARTUP));
- if (env_sge_commlib_debug != NULL) {
- cl_ret = cl_com_setup_commlib(CL_NO_THREAD, CL_LOG_OFF, sge_gdi_ctx_log_flush_func);
- } else {
-@@ -1171,7 +1171,7 @@ static int sge_gdi_ctx_class_prepare_enr
- alive_back = thiz->is_alive(thiz);
- cl_ret = cl_com_set_error_func(general_communication_error);
- if (cl_ret != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(cl_ret)) );
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(cl_ret)) );
- }
-
- if (alive_back == CL_RETVAL_OK && getenv("SGE_TEST_HEARTBEAT_TIMEOUT") == NULL ) {
-@@ -1300,7 +1300,7 @@ static int sge_gdi_ctx_class_is_alive(sg
- sge_gdi_ctx_class_error(thiz, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR,
- "cl_commlib_get_endpoint_status failed: "SFQ, cl_get_error_text(cl_ret));
- } else {
-- DEBUG((SGE_EVENT,MSG_GDI_QMASTER_STILL_RUNNING));
-+ DEBUG((SGE_EVENT, "%s", MSG_GDI_QMASTER_STILL_RUNNING));
- }
-
- if (status != NULL) {
-@@ -1970,7 +1970,7 @@ int sge_gdi2_setup(sge_gdi_ctx_class_t *
-
- if (context_ref && sge_gdi_ctx_is_setup(*context_ref)) {
- if (alpp_was_null) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_GDI_ALREADY_SETUP));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_GDI_ALREADY_SETUP));
- } else {
- answer_list_add_sprintf(alpp, STATUS_EEXIST, ANSWER_QUALITY_WARNING,
- MSG_GDI_GDI_ALREADY_SETUP);
-diff -up GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c.format GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c
---- GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c 2014-10-03 21:11:16.324852172 -0600
-@@ -537,7 +537,7 @@ sge_gdi_packet_execute_external(sge_gdi_
- cl_get_error_text(commlib_error)));
- }
- } else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_SENDINGGDIREQUESTFAILED));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_SENDINGGDIREQUESTFAILED));
- }
- answer_list_add(answer_list, SGE_EVENT, STATUS_NOQMASTER, ANSWER_QUALITY_ERROR);
- ret = false;
-@@ -689,7 +689,7 @@ sge_gdi_packet_execute_external(sge_gdi_
- }
- if (gdi_mismatch) {
- /* For unusual errors, give more detail */
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_MISMATCH_SEND_RECEIVE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_MISMATCH_SEND_RECEIVE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_NOQMASTER, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-diff -up GE2011.11p1/source/libs/gdi/sge_qexec.c.format GE2011.11p1/source/libs/gdi/sge_qexec.c
---- GE2011.11p1/source/libs/gdi/sge_qexec.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_qexec.c 2014-10-03 21:11:16.324852172 -0600
-@@ -190,7 +190,7 @@ sge_tid_t sge_qexecve(sge_gdi_ctx_class_
-
- if (init_packbuffer(&pb, 1024, 0) != PACK_SUCCESS) {
- lFreeElem(&petrep);
-- sprintf(lasterror, MSG_GDI_OUTOFMEMORY);
-+ sprintf(lasterror, "%s", MSG_GDI_OUTOFMEMORY);
- DRETURN(NULL);
- }
-
-diff -up GE2011.11p1/source/libs/gdi/sge_security.c.format GE2011.11p1/source/libs/gdi/sge_security.c
---- GE2011.11p1/source/libs/gdi/sge_security.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_security.c 2014-10-03 21:11:16.325852195 -0600
-@@ -173,7 +173,7 @@ int sge_ssl_setup_security_path(const ch
- DENTER(TOP_LAYER, "sge_ssl_setup_security_path");
-
- if (progname == NULL) {
-- CRITICAL((SGE_EVENT, MSG_GDI_NO_VALID_PROGRAMM_NAME));
-+ CRITICAL((SGE_EVENT, "%s", MSG_GDI_NO_VALID_PROGRAMM_NAME));
- FREE(user_name);
- DRETURN(-1);
- }
-@@ -473,7 +473,7 @@ static cl_bool_t ssl_cert_verify_func(cl
-
- if (value == NULL) {
- /* This should never happen */
-- CRITICAL((SGE_EVENT, MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
- DRETURN(CL_FALSE);
- }
-
-@@ -1385,15 +1385,15 @@ sge_gdi_packet_parse_auth_info(sge_gdi_p
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- }
- DRETURN(ret);
-diff -up GE2011.11p1/source/libs/japi/drmaa.c.format GE2011.11p1/source/libs/japi/drmaa.c
---- GE2011.11p1/source/libs/japi/drmaa.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/libs/japi/drmaa.c 2014-10-03 21:11:16.326852218 -0600
-@@ -3885,7 +3885,7 @@ static char *drmaa_expand_wd_path(const
-
- /* First look for the job index placeholder. It is illegal. */
- if (strstr(path, "$TASK_ID") != NULL) {
-- sprintf(str, MSG_DRMAA_INC_NOT_ALLOWED);
-+ sprintf(str, "%s", MSG_DRMAA_INC_NOT_ALLOWED);
- answer_list_add(answer_list, str, STATUS_ENOSUCHUSER,
- ANSWER_QUALITY_ERROR);
- DRETURN(NULL);
-diff -up GE2011.11p1/source/libs/mir/sge_mirror.c.format GE2011.11p1/source/libs/mir/sge_mirror.c
---- GE2011.11p1/source/libs/mir/sge_mirror.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/mir/sge_mirror.c 2014-10-03 21:11:16.327852242 -0600
-@@ -953,10 +953,10 @@ static sge_mirror_error _sge_mirror_unsu
- evc->ec_unsubscribe(evc, sgeE_SCHEDDMONITOR);
- break;
- case SGE_TYPE_SHUTDOWN:
-- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS));
- break;
- case SGE_TYPE_MARK_4_REGISTRATION:
-- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS));
- break;
- case SGE_TYPE_SUBMITHOST:
- evc->ec_unsubscribe(evc, sgeE_SUBMITHOST_LIST);
-@@ -1062,7 +1062,7 @@ sge_mirror_error sge_mirror_process_even
- lFreeList(&event_list);
- }
- } else {
-- WARNING((SGE_EVENT, MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
-+ WARNING((SGE_EVENT, "%s", MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
- evc->ec_mark4registration(evc);
- ret = SGE_EM_TIMEOUT;
- }
-@@ -1071,7 +1071,7 @@ sge_mirror_error sge_mirror_process_even
- test_debug++;
- if (test_debug > 3) {
- test_debug = 0;
-- WARNING((SGE_EVENT, MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
-+ WARNING((SGE_EVENT, "%s", MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
- evc->ec_mark4registration(evc);
- ret = SGE_EM_TIMEOUT;
- }
-diff -up GE2011.11p1/source/libs/sched/sge_select_queue.c.format GE2011.11p1/source/libs/sched/sge_select_queue.c
---- GE2011.11p1/source/libs/sched/sge_select_queue.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/sched/sge_select_queue.c 2014-10-03 21:11:16.329852288 -0600
-@@ -339,7 +339,7 @@ find_best_result(dispatch_t r1, dispatch
- DRETURN(DISPATCH_MISSING_ATTR);
- }
-
-- CRITICAL((SGE_EVENT, MSG_JOBMATCHINGUNEXPECTEDRESULT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_JOBMATCHINGUNEXPECTEDRESULT));
- DRETURN(DISPATCH_NEVER);
- }
-
-@@ -893,7 +893,7 @@ parallel_maximize_slots_pe(sge_assignmen
- /* --- prepare the posible slots for the binary search */
- max_slotsp = (max_slots - min_slots+1);
- if (!add_pe_slots_to_category(&use_category, &max_slotsp, pe, min_slots, max_slots, pe_range)) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- DRETURN(DISPATCH_NEVER_CAT);
- }
- if (max_slotsp == 0) {
-@@ -6380,7 +6380,7 @@ void sge_create_load_list(const lList *q
-
- error:
- DPRINTF(("error in sge_create_load_list!"));
-- ERROR((SGE_EVENT, MSG_SGETEXT_CONSUMABLE_AS_LOAD));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_CONSUMABLE_AS_LOAD));
- sge_free_load_list(load_list);
- DRETURN_VOID;
-
-diff -up GE2011.11p1/source/libs/sched/sge_ssi.c.format GE2011.11p1/source/libs/sched/sge_ssi.c
---- GE2011.11p1/source/libs/sched/sge_ssi.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/sched/sge_ssi.c 2014-10-03 21:11:16.329852288 -0600
-@@ -202,7 +202,7 @@ bool sge_ssi_job_start(sge_evc_class_t *
- lListElem *queue, *granted_queue;
-
- if(tasks[i].host_name == NULL) {
-- ERROR((SGE_EVENT, MSG_SSI_MISSINGHOSTNAMEINTASKLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_SSI_MISSINGHOSTNAMEINTASKLIST));
- DRETURN(false);
- }
-
-diff -up GE2011.11p1/source/libs/sgeobj/config.c.format GE2011.11p1/source/libs/sgeobj/config.c
---- GE2011.11p1/source/libs/sgeobj/config.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/config.c 2014-10-03 21:11:16.330852312 -0600
-@@ -749,7 +749,7 @@ bool set_conf_enum(lList **alpp, lList *
- }
-
- if(!uval) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_CONFIGINVALIDQUEUESPECIFIED ));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_CONFIGINVALIDQUEUESPECIFIED ));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DEXIT;
- return false;
-diff -up GE2011.11p1/source/libs/sgeobj/sge_answer.c.format GE2011.11p1/source/libs/sgeobj/sge_answer.c
---- GE2011.11p1/source/libs/sgeobj/sge_answer.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_answer.c 2014-10-03 21:11:16.330852312 -0600
-@@ -1016,19 +1016,19 @@ static bool answer_log(lListElem *answer
-
- switch (lGetUlong(answer, AN_quality)) {
- case ANSWER_QUALITY_CRITICAL:
-- CRITICAL((SGE_EVENT, lGetString(answer, AN_text)));
-+ CRITICAL((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- ret = true;
- break;
- case ANSWER_QUALITY_ERROR:
-- ERROR((SGE_EVENT, lGetString(answer, AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- ret = true;
- break;
- case ANSWER_QUALITY_WARNING:
-- WARNING((SGE_EVENT, lGetString(answer, AN_text)));
-+ WARNING((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- break;
- case ANSWER_QUALITY_INFO:
- if (show_info) {
-- INFO((SGE_EVENT, lGetString(answer, AN_text)));
-+ INFO((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- }
- break;
- default:
-diff -up GE2011.11p1/source/libs/sgeobj/sge_attr.c.format GE2011.11p1/source/libs/sgeobj/sge_attr.c
---- GE2011.11p1/source/libs/sgeobj/sge_attr.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_attr.c 2014-10-03 21:11:16.331852335 -0600
-@@ -414,7 +414,7 @@ attr_list_add(lList **this_list, lList *
- if (ambiguous_href_list != NULL &&
- lGetNumberOfElem(*ambiguous_href_list) >= 1 &&
- !(flags & HOSTATTR_ALLOW_AMBIGUITY)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_RESULTUNAMBIGUOUS_S));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_RESULTUNAMBIGUOUS_S));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- } else {
-@@ -583,7 +583,7 @@ attr_list_find_value(const lList *this_l
- /*
- * Should never happen.
- */
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOCONFVALUE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOCONFVALUE));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- }
-@@ -640,7 +640,7 @@ attr_list_find_value_href(const lList *t
- /*
- * Should never happen.
- */
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOCONFVALUE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOCONFVALUE));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- }
-@@ -852,7 +852,7 @@ attr_list_parse_from_string(lList **this
- value[0] = '\0';
- value++;
- } else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT,
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s",
- MSG_ATTR_EQUALSIGNEXPRECTED));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
-@@ -895,7 +895,7 @@ attr_list_parse_from_string(lList **this
- }
- }
- } else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOVALUEGIVEN));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOVALUEGIVEN));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/libs/sgeobj/sge_calendar.c.format GE2011.11p1/source/libs/sgeobj/sge_calendar.c
---- GE2011.11p1/source/libs/sgeobj/sge_calendar.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_calendar.c 2014-10-03 21:11:16.331852335 -0600
-@@ -475,7 +475,7 @@ static u_long32 is_week_entry_active(lLi
- state = is_week_entry_active(new_tm, week_entry, limit, next_state, rec_count++);
- }
- else {
-- ERROR((SGE_EVENT, MSG_CALENDAR_CALCTERMINATED));
-+ ERROR((SGE_EVENT, "%s", MSG_CALENDAR_CALCTERMINATED));
- }
-
- lFreeElem(&new_tm);
-@@ -1293,7 +1293,7 @@ static int disabled_year_entry(lListElem
- DRETURN(-1);
- }
- } else {
-- sprintf(parse_error, MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE );
-+ sprintf(parse_error, "%s", MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE );
- goto ERROR;
- }
-
-@@ -1402,7 +1402,7 @@ static int year_day_range(lListElem **tm
- DRETURN(-1);
- }
- if (tm_yday_cmp(t1, t2)>0) {
-- sprintf(parse_error, MSG_ANSWER_FIRSTYESTERDAYINRANGEMUSTBEBEFORESECONDYESTERDAY);
-+ sprintf(parse_error, "%s", MSG_ANSWER_FIRSTYESTERDAYINRANGEMUSTBEBEFORESECONDYESTERDAY);
- lFreeElem(&t1);
- DRETURN(-1);
- }
-@@ -1442,7 +1442,7 @@ static int year_day(lListElem **tm) {
- }
-
- if (scan(NULL, NULL)!=DOT) {
-- sprintf(parse_error, MSG_PARSE_MISSINGPOINTAFTERDAY);
-+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGPOINTAFTERDAY);
- DRETURN(-1);
- }
- eat_token();
-@@ -1452,7 +1452,7 @@ static int year_day(lListElem **tm) {
- }
-
- if (scan(NULL, NULL)!=DOT) {
-- sprintf(parse_error, MSG_PARSE_MISSINGPOINTAFTERMONTH );
-+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGPOINTAFTERMONTH );
- DRETURN(-1);
- }
- eat_token();
-@@ -1634,7 +1634,7 @@ static int daytime_range(lListElem **tmr
- goto ERROR;
- }
- if (scan(NULL, NULL)!=MINUS) {
-- sprintf(parse_error, MSG_PARSE_MISSINGDASHINDAYTIMERANGE);
-+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGDASHINDAYTIMERANGE);
- goto ERROR;
- }
- eat_token();
-@@ -1642,7 +1642,7 @@ static int daytime_range(lListElem **tmr
- goto ERROR;
- }
- if (!tm_daytime_cmp(t1, t2)) {
-- sprintf(parse_error, MSG_PARSE_RANGEBEGISEQUALTOEND);
-+ sprintf(parse_error, "%s", MSG_PARSE_RANGEBEGISEQUALTOEND);
- goto ERROR;
- }
-
-@@ -1703,7 +1703,7 @@ static int daytime(lListElem **tm) {
- SUCCESS:
- if (h==24) {
- if (m || s) {
-- sprintf(parse_error, MSG_PARSE_DAYTIMESBEYOND24HNOTALLOWED);
-+ sprintf(parse_error, "%s", MSG_PARSE_DAYTIMESBEYOND24HNOTALLOWED);
- DRETURN(-1);
- }
- }
-@@ -1804,7 +1804,7 @@ static int disabled_week_list(lList **al
-
- /* complain about still unused tokens */
- if (scan(NULL, NULL)!=NO_TOKEN) {
-- sprintf(parse_error, MSG_PARSE_UNRECOGNIZEDTOKENATEND);
-+ sprintf(parse_error, "%s", MSG_PARSE_UNRECOGNIZEDTOKENATEND);
- goto ERROR;
- }
-
-@@ -1857,7 +1857,7 @@ static int disabled_week_entry(lListElem
- goto ERROR;
- }
- } else {
-- sprintf(parse_error, MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE);
-+ sprintf(parse_error, "%s", MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE);
- goto ERROR;
- }
-
-@@ -2153,7 +2153,7 @@ static int week_day_range(lListElem **tm
- goto ERROR;
-
- if (tm_wday_cmp(t1, t2)==0) {
-- sprintf(parse_error, MSG_PARSE_FOUNDUSELESSWEEKDAYRANGE);
-+ sprintf(parse_error, "%s", MSG_PARSE_FOUNDUSELESSWEEKDAYRANGE);
- goto ERROR;
- }
- }
-@@ -2204,7 +2204,7 @@ static int week_day(lListElem **tm) {
- DENTER(TOP_LAYER, "week_day");
-
- if (scan(NULL, NULL)!=STRING) {
-- sprintf(parse_error, MSG_PARSE_EXPECTEDSTRINGFORWEEKDAY);
-+ sprintf(parse_error, "%s", MSG_PARSE_EXPECTEDSTRINGFORWEEKDAY);
- DRETURN(-1);
- }
- s = get_string();
-@@ -2286,7 +2286,7 @@ static int scan(const char *s, token_set
- for (j=0; t[j] && isdigit((int) t[j]); j++) {
- number = old_number * 10 + (t[j]-'0');
- if (number<old_number) {
-- ERROR((SGE_EVENT, MSG_PARSE_OVERFLOWERRORWHILEPARSING));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_OVERFLOWERRORWHILEPARSING));
- token = ERR_TOKEN;
- token_is_valid = 1;
- DRETURN(token);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_centry.c.format GE2011.11p1/source/libs/sgeobj/sge_centry.c
---- GE2011.11p1/source/libs/sgeobj/sge_centry.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_centry.c 2014-10-03 21:11:16.332852358 -0600
-@@ -882,7 +882,7 @@ centry_list_parse_from_string(lList *com
- /* allocate space for attribute list if no list is passed */
- if (complex_attributes == NULL) {
- if ((complex_attributes = lCreateList("qstat_l_requests", CE_Type)) == NULL) {
-- ERROR((SGE_EVENT, MSG_PARSE_NOALLOCATTRLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NOALLOCATTRLIST));
- DRETURN(NULL);
- }
- }
-@@ -920,7 +920,7 @@ centry_list_parse_from_string(lList *com
- /* create new element, fill in the values and append it */
- if ( (complex_attribute= lGetElemStr(complex_attributes, CE_name, attr)) == NULL) {
- if ((complex_attribute = lCreateElem(CE_Type)) == NULL) {
-- ERROR((SGE_EVENT, MSG_PARSE_NOALLOCATTRELEM));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NOALLOCATTRELEM));
- lFreeList(&complex_attributes);
- sge_free_saved_vars(context);
- DRETURN(NULL);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_conf.c.format GE2011.11p1/source/libs/sgeobj/sge_conf.c
---- GE2011.11p1/source/libs/sgeobj/sge_conf.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_conf.c 2014-10-03 21:11:16.535857093 -0600
-@@ -308,7 +308,7 @@ static int jsv_threshold = 5000;
- static tConfEntry conf_entries[] = {
- { "execd_spool_dir", 1, NULL, 1, NULL },
- { "mailer", 1, MAILER, 1, NULL },
-- { "xterm", 1, "/usr/bin/X11/xterm",1, NULL },
-+ { "xterm", 1, "/usr/bin/xterm",1, NULL },
- { "load_sensor", 1, "none", 1, NULL },
- { "prolog", 1, PROLOG, 1, NULL },
- { "epilog", 1, EPILOG, 1, NULL },
-@@ -1051,7 +1051,7 @@ int merge_configuration(lList **answer_l
- lFreeList(&mlist);
-
- if (!global) {
-- WARNING((SGE_EVENT, MSG_CONF_NOCONFIGFROMMASTER));
-+ WARNING((SGE_EVENT, "%s", MSG_CONF_NOCONFIGFROMMASTER));
- DRETURN(-2);
- }
-
-diff -up GE2011.11p1/source/libs/sgeobj/sge_cqueue.c.format GE2011.11p1/source/libs/sgeobj/sge_cqueue.c
---- GE2011.11p1/source/libs/sgeobj/sge_cqueue.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_cqueue.c 2014-10-03 21:11:16.333852381 -0600
-@@ -1251,7 +1251,7 @@ cqueue_xattr_pre_gdi(lList *this_list, l
- cqueue_attribute_array[index].href_attr);
-
- if (strcmp(HOSTREF_DEFAULT, attr_hostname)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT,
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s",
- MSG_CQUEUE_NONDEFNOTALLOWED));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -1507,7 +1507,7 @@ cqueue_list_locate_qinstance_msg(lList *
- sge_dstring_free(&host_domain_buffer);
- } else {
- if (raise_error) {
-- ERROR((SGE_EVENT, MSG_CQUEUE_FULLNAMEISNULL));
-+ ERROR((SGE_EVENT, "%s", MSG_CQUEUE_FULLNAMEISNULL));
- }
- }
- DRETURN(ret);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_job.c.format GE2011.11p1/source/libs/sgeobj/sge_job.c
---- GE2011.11p1/source/libs/sgeobj/sge_job.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_job.c 2014-10-03 21:11:16.334852405 -0600
-@@ -1166,11 +1166,11 @@ int job_list_add_job(lList **job_list, c
- DENTER(TOP_LAYER, "job_list_add_job");
-
- if (!job_list) {
-- ERROR((SGE_EVENT, MSG_JOB_JLPPNULL));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_JLPPNULL));
- DRETURN(1);
- }
- if (!job) {
-- ERROR((SGE_EVENT, MSG_JOB_JEPNULL));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_JEPNULL));
- DRETURN(1);
- }
-
-@@ -1906,7 +1906,7 @@ void job_check_correct_id_sublists(lList
- if (field[i] != JB_ja_structure)
- range_correct_end(range);
- if (range_is_id_within(range, 0)) {
-- ERROR((SGE_EVENT, MSG_JOB_NULLNOTALLOWEDT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NULLNOTALLOWEDT));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN,
- ANSWER_QUALITY_ERROR);
- DRETURN_VOID;
-@@ -1941,7 +1941,7 @@ void job_check_correct_id_sublists(lList
- }
- has_structure = !range_list_is_empty(lGetList(job, JB_ja_structure));
- if (!has_structure) {
-- ERROR((SGE_EVENT, MSG_JOB_NOIDNOTALLOWED));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOIDNOTALLOWED));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN,
- ANSWER_QUALITY_ERROR);
- DRETURN_VOID;
-@@ -2608,7 +2608,7 @@ int job_resolve_host_for_path_list(const
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- } else if (res != CL_RETVAL_PARAMS) {
-- ERROR((SGE_EVENT,MSG_PARSE_NULLPOINTERRECEIVED ));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NULLPOINTERRECEIVED ));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- }
-@@ -2625,13 +2625,13 @@ int job_resolve_host_for_path_list(const
-
- if(hostname == NULL){
- if(temp_hostname == NULL){
-- ERROR((SGE_EVENT, MSG_PARSE_DUPLICATEHOSTINFILESPEC));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_DUPLICATEHOSTINFILESPEC));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- }
- }
- else if( temp_hostname && strcmp(hostname, temp_hostname)==0){
-- ERROR((SGE_EVENT, MSG_PARSE_DUPLICATEHOSTINFILESPEC));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_DUPLICATEHOSTINFILESPEC));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c.format GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c
---- GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c 2014-10-03 21:11:16.335852428 -0600
-@@ -3029,7 +3029,7 @@ bool jsv_is_modify_rejected(sge_gdi_ctx_
- /*
- * JSV is active but no modification allowed
- */
-- ERROR((SGE_EVENT, MSG_JSV_ALLOWED));
-+ ERROR((SGE_EVENT, "%s", MSG_JSV_ALLOWED));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = true;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_pack.c.format GE2011.11p1/source/libs/sgeobj/sge_pack.c
---- GE2011.11p1/source/libs/sgeobj/sge_pack.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_pack.c 2014-10-03 21:11:16.335852428 -0600
-@@ -69,7 +69,7 @@ lCondition *lWhereFromElem(const lListEl
- if (lGetUlong(where, PACK_id) == SGE_WHERE) {
- size = getByteArray(&buffer, where, PACK_string);
- if (size <= 0){
-- ERROR((SGE_EVENT, MSG_PACK_INVALIDPACKDATA ));
-+ ERROR((SGE_EVENT, "%s", MSG_PACK_INVALIDPACKDATA ));
- } else if ((ret = init_packbuffer_from_buffer(&pb, buffer, size)) == PACK_SUCCESS) {
- cull_unpack_cond(&pb, &cond);
- clear_packbuffer(&pb);
-@@ -117,7 +117,7 @@ lEnumeration *lWhatFromElem(const lListE
- if (lGetUlong(what, PACK_id) == SGE_WHAT) {
- size = getByteArray(&buffer, what, PACK_string);
- if (size <= 0){
-- ERROR((SGE_EVENT, MSG_PACK_INVALIDPACKDATA ));
-+ ERROR((SGE_EVENT, "%s", MSG_PACK_INVALIDPACKDATA ));
- } else if ((ret = init_packbuffer_from_buffer(&pb, buffer, size)) == PACK_SUCCESS) {
- cull_unpack_enum(&pb, &cond);
- clear_packbuffer(&pb);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_qref.c.format GE2011.11p1/source/libs/sgeobj/sge_qref.c
---- GE2011.11p1/source/libs/sgeobj/sge_qref.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_qref.c 2014-10-03 21:11:16.335852428 -0600
-@@ -815,7 +815,7 @@ qref_list_is_valid(const lList *this_lis
- }
- }
- } else {
-- ERROR((SGE_EVENT, MSG_QREF_QNOTREQUESTABLE));
-+ ERROR((SGE_EVENT, "%s", MSG_QREF_QNOTREQUESTABLE));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/libs/sgeobj/sge_range.c.format GE2011.11p1/source/libs/sgeobj/sge_range.c
---- GE2011.11p1/source/libs/sgeobj/sge_range.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_range.c 2014-10-03 21:11:16.336852451 -0600
-@@ -1694,7 +1694,7 @@ void range_parse_from_string(lListElem *
- DRETURN_VOID;
- }
- else {
-- sprintf( msg, MSG_GDI_NEGATIVSTEP );
-+ sprintf( msg, "%s", MSG_GDI_NEGATIVSTEP );
- answer_list_add(answer_list, msg, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
- lFreeElem(&r);
-@@ -1769,7 +1769,7 @@ range_list_parse_from_string(lList **thi
- s; s = sge_strtok_r(NULL, RANGE_SEPARATOR_CHARS, &context)) {
- if (!first && undefined) {
- /* first was undefined - no more ranges allowed */
-- ERROR((SGE_EVENT, MSG_GDI_UNEXPECTEDRANGEFOLLOWINGUNDEFINED));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_UNEXPECTEDRANGEFOLLOWINGUNDEFINED));
- sge_free_saved_vars(context);
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
-@@ -1785,7 +1785,7 @@ range_list_parse_from_string(lList **thi
- undefined = true;
- } else {
- /* second range may not be undefined ! */
-- ERROR((SGE_EVENT, MSG_GDI_UNEXPECTEDUNDEFINEDFOLLOWINGRANGE));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_UNEXPECTEDUNDEFINEDFOLLOWINGRANGE));
- sge_free_saved_vars(context);
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c.format GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c
---- GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c 2014-10-03 21:11:16.337852475 -0600
-@@ -106,7 +106,7 @@ bool rqs_parse_filter_from_string(lListE
- /* We have a expanded list */
- lSetBool(tmp_filter, RQRF_expand, true);
- if (buffer[strlen(buffer)-1] != '}') {
-- ERROR((SGE_EVENT, MSG_RESOURCEQUOTA_NOVALIDEXPANDEDLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_RESOURCEQUOTA_NOVALIDEXPANDEDLIST));
- answer_list_add(alp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DRETURN(false);
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c.format GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c
---- GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c 2014-10-03 21:11:16.337852475 -0600
-@@ -571,7 +571,7 @@ bool sconf_set_config(lList **config, lL
- } else {
- *master_sconf_list = store;
- if (!*master_sconf_list) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_USE_DEFAULT_CONFIG));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_USE_DEFAULT_CONFIG));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_WARNING);
-
- *master_sconf_list = lCreateList("schedd config list", SC_Type);
-@@ -2579,7 +2579,7 @@ void sconf_print_config(void){
- DENTER(TOP_LAYER, "sconf_print_config");
-
- if (!sconf_is()){
-- ERROR((SGE_EVENT, MSG_SCONF_NO_CONFIG));
-+ ERROR((SGE_EVENT, "%s", MSG_SCONF_NO_CONFIG));
- DRETURN_VOID;
- }
-
-@@ -2815,7 +2815,7 @@ bool sconf_validate_config_(lList **answ
- pos.new_config = true;
-
- if (!calc_pos()){
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_INCOMPLETE_SCHEDD_CONFIG));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_INCOMPLETE_SCHEDD_CONFIG));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -2912,7 +2912,7 @@ bool sconf_validate_config_(lList **answ
- const char *schedd_info = lGetString(lFirst(*(object_type_get_master_list(SGE_TYPE_SCHEDD_CONF))), SC_schedd_job_info);
-
- if (schedd_info == NULL){
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -2928,7 +2928,7 @@ bool sconf_validate_config_(lList **answ
- else if (!strcmp("job_list", key))
- ikey = SCHEDD_JOB_INFO_JOB_LIST;
- else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -2939,7 +2939,7 @@ bool sconf_validate_config_(lList **answ
- INF_NOT_ALLOWED);
- if (rlp == NULL) {
- lFreeList(&alp);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDJOBLIST));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDJOBLIST));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -3050,7 +3050,7 @@ bool sconf_validate_config_(lList **answ
- else {
- /* ensure we get a non-zero/non-infinity duration default in reservation scheduling mode */
- if (max_reservation != 0 && uval == 0) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_RR_REQUIRES_DEFAULT_DURATION));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_RR_REQUIRES_DEFAULT_DURATION));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_ulong.c.format GE2011.11p1/source/libs/sgeobj/sge_ulong.c
---- GE2011.11p1/source/libs/sgeobj/sge_ulong.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_ulong.c 2014-10-03 21:11:16.338852498 -0600
-@@ -272,7 +272,7 @@ ulong_parse_date_time_from_string(u_long
- memset(tmp_str, 0, sizeof(tmp_str));
-
- if (!string || string[0] == '\0') {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_NODATE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_NODATE));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -285,7 +285,7 @@ ulong_parse_date_time_from_string(u_long
- }
-
- if (strlen(string) > sizeof(stringT)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_STARTTIMETOOLONG));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_STARTTIMETOOLONG));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -309,7 +309,7 @@ ulong_parse_date_time_from_string(u_long
-
- if ((i != 0) && (i != 2)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDSECONDS));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDSECONDS));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -325,7 +325,7 @@ ulong_parse_date_time_from_string(u_long
-
- if ((i != 8) && (i != 10) && (i != 12)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDHOURMIN));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDHOURMIN));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -369,7 +369,7 @@ ulong_parse_date_time_from_string(u_long
- timeptr.tm_mon=atoi(tmp_str)-1;/* 00==Jan, we don't like that do we */
- if ((timeptr.tm_mon>11)||(timeptr.tm_mon<0)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDMONTH));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDMONTH));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -392,7 +392,7 @@ ulong_parse_date_time_from_string(u_long
- if ((timeptr.tm_mday > 31) || (timeptr.tm_mday < 1)) {
- /* actually mktime() should frigging do it */
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDDAY));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDDAY));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -410,7 +410,7 @@ ulong_parse_date_time_from_string(u_long
- non_seconds+=2;
-
- if ((timeptr.tm_hour > 23) || (timeptr.tm_hour < 0)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDHOUR));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDHOUR));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -428,7 +428,7 @@ ulong_parse_date_time_from_string(u_long
-
- if ((timeptr.tm_min > 59)||(timeptr.tm_min < 0)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDMINUTE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDMINUTE));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -445,7 +445,7 @@ ulong_parse_date_time_from_string(u_long
- }
- if ((timeptr.tm_sec>59)||(timeptr.tm_mday<0)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDSECOND));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDSECOND));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -468,7 +468,7 @@ ulong_parse_date_time_from_string(u_long
-
- if (gmt_secs < 0) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_NODATEFROMINPUT));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_NODATEFROMINPUT));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -610,7 +610,7 @@ ulong_parse_value_from_string(u_long32 *
-
- *this_ulong = strtol(string, &s, 10);
- if (string == s) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ULNG_INVALID_VALUE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ULNG_INVALID_VALUE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_userset.c.format GE2011.11p1/source/libs/sgeobj/sge_userset.c
---- GE2011.11p1/source/libs/sgeobj/sge_userset.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_userset.c 2014-10-03 21:11:16.338852498 -0600
-@@ -279,7 +279,7 @@ int userset_validate_entries(lListElem *
-
- for_each(ep, lGetList(userset, US_entries)) {
- if (!lGetPosString(ep, name_pos)) {
-- ERROR((SGE_EVENT, MSG_US_INVALIDUSERNAME));
-+ ERROR((SGE_EVENT, "%s", MSG_US_INVALIDUSERNAME));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
-diff -up GE2011.11p1/source/libs/uti/config_file.c.format GE2011.11p1/source/libs/uti/config_file.c
---- GE2011.11p1/source/libs/uti/config_file.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/config_file.c 2014-10-03 21:11:16.339852521 -0600
-@@ -440,7 +440,7 @@ char **allowed
- }
-
- if (name_len==0) {
-- sprintf(err_str, MSG_CONF_ATLEASTONECHAR);
-+ sprintf(err_str, "%s", MSG_CONF_ATLEASTONECHAR);
- if (config_errfunc)
- config_errfunc(err_str);
- return 1;
-diff -up GE2011.11p1/source/libs/uti/setup_path.c.format GE2011.11p1/source/libs/uti/setup_path.c
---- GE2011.11p1/source/libs/uti/setup_path.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/setup_path.c 2014-10-03 21:11:16.339852521 -0600
-@@ -348,7 +348,7 @@ bool sge_setup_paths(u_long32 progid, co
- cell_root = sge_malloc(strlen(sge_root) + strlen(sge_cell) + 2);
- if (cell_root == NULL) {
- if (error_dstring == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- SGE_EXIT(NULL, 1);
- } else {
- sge_dstring_copy_string(error_dstring, MSG_SGETEXT_NOMEM);
-diff -up GE2011.11p1/source/libs/uti/sge_arch.c.format GE2011.11p1/source/libs/uti/sge_arch.c
---- GE2011.11p1/source/libs/uti/sge_arch.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_arch.c 2014-10-03 21:11:16.339852521 -0600
-@@ -140,7 +140,7 @@ error:
- if (buffer != NULL) {
- sge_strlcpy(buffer, MSG_SGEROOTNOTSET, size);
- } else {
-- CRITICAL((SGE_EVENT, MSG_SGEROOTNOTSET));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SGEROOTNOTSET));
- }
- }
-
-@@ -240,7 +240,7 @@ const char *sge_get_alias_path(void)
-
- len = strlen(sge_root) + strlen(sge_cell) + strlen(COMMON_DIR) + strlen(ALIAS_FILE) + 5;
- if (!(cp = malloc(len))) {
-- CRITICAL((SGE_EVENT, MSG_MEMORY_MALLOCFAILEDFORPATHTOHOSTALIASFILE ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_MALLOCFAILEDFORPATHTOHOSTALIASFILE ));
- SGE_EXIT(NULL, 1);
- }
-
-diff -up GE2011.11p1/source/libs/uti/sge_bootstrap.c.format GE2011.11p1/source/libs/uti/sge_bootstrap.c
---- GE2011.11p1/source/libs/uti/sge_bootstrap.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_bootstrap.c 2014-10-03 21:11:16.340852545 -0600
-@@ -469,7 +469,7 @@ bool sge_bootstrap(const char *bootstrap
- /* get filepath of bootstrap file */
- if (bootstrap_file == NULL) {
- if (error_dstring == NULL) {
-- CRITICAL((SGE_EVENT, MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE));
- } else {
- sge_dstring_sprintf(error_dstring, MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE);
- }
-diff -up GE2011.11p1/source/libs/uti/sge_csp_path.c.format GE2011.11p1/source/libs/uti/sge_csp_path.c
---- GE2011.11p1/source/libs/uti/sge_csp_path.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_csp_path.c 2014-10-03 21:11:16.340852545 -0600
-@@ -151,7 +151,7 @@ static cl_bool_t ssl_cert_verify_func(cl
-
- if (value == NULL) {
- /* This should never happen */
-- CRITICAL((SGE_EVENT, MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
- DEXIT;
- return CL_FALSE;
- }
-diff -up GE2011.11p1/source/libs/uti/sge_edit.c.format GE2011.11p1/source/libs/uti/sge_edit.c
---- GE2011.11p1/source/libs/uti/sge_edit.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_edit.c 2014-10-03 21:11:16.340852545 -0600
-@@ -53,7 +53,7 @@ int sge_edit(const char *fname, uid_t my
-
- if (fname == NULL)
- {
-- ERROR((SGE_EVENT, MSG_NULLPOINTER));
-+ ERROR((SGE_EVENT, "%s", MSG_NULLPOINTER));
- return -1;
- }
-
-diff -up GE2011.11p1/source/libs/uti/sge_loadmem.c.format GE2011.11p1/source/libs/uti/sge_loadmem.c
---- GE2011.11p1/source/libs/uti/sge_loadmem.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_loadmem.c 2014-10-03 21:11:16.341852568 -0600
-@@ -580,7 +580,7 @@ int sge_loadmem(sge_mem_info_t *mem_info
- pagesize = sysconf(_SC_PAGESIZE);
- first = 0;
- if (pagesize == -1) {
-- ERROR((SGE_EVENT, MSG_SYSTEM_NOPAGESIZEASSUME8192 ));
-+ ERROR((SGE_EVENT, "%s", MSG_SYSTEM_NOPAGESIZEASSUME8192 ));
- pagesize = 8192;
- }
- }
-diff -up GE2011.11p1/source/libs/uti/sge_monitor.c.format GE2011.11p1/source/libs/uti/sge_monitor.c
---- GE2011.11p1/source/libs/uti/sge_monitor.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_monitor.c 2014-10-03 21:11:16.341852568 -0600
-@@ -236,7 +236,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->output_line2 = (dstring*) malloc(sizeof(dstring));
-
- if (monitor->output_line1 == NULL || monitor->output_line2 == NULL) {
-- CRITICAL((SGE_EVENT, MSG_UTI_MONITOR_MEMERROR));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROR));
- exit(1);
- }
-
-@@ -257,7 +257,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_sch_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -269,7 +269,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_gdi_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -281,7 +281,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_lis_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -293,7 +293,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_edt_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -305,7 +305,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_tet_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-diff -up GE2011.11p1/source/libs/uti/sge_os.c.format GE2011.11p1/source/libs/uti/sge_os.c
---- GE2011.11p1/source/libs/uti/sge_os.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_os.c 2014-10-03 21:11:16.341852568 -0600
-@@ -352,12 +352,12 @@ bool sge_daemonize_prepare(sge_gdi_ctx_c
-
- /* create pipe */
- if ( pipe(fd_pipe) < 0) {
-- CRITICAL((SGE_EVENT, MSG_UTI_DAEMONIZE_CANT_PIPE));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_CANT_PIPE));
- DRETURN(false);
- }
-
- if ( fcntl(fd_pipe[0], F_SETFL, O_NONBLOCK) != 0) {
-- CRITICAL((SGE_EVENT, MSG_UTI_DAEMONIZE_CANT_FCNTL_PIPE));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_CANT_FCNTL_PIPE));
- DRETURN(false);
- }
-
-@@ -418,13 +418,13 @@ bool sge_daemonize_prepare(sge_gdi_ctx_c
-
- switch(exit_status) {
- case SGE_DEAMONIZE_OK:
-- INFO((SGE_EVENT, MSG_UTI_DAEMONIZE_OK));
-+ INFO((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_OK));
- break;
- case SGE_DAEMONIZE_DEAD_CHILD:
-- WARNING((SGE_EVENT, MSG_UTI_DAEMONIZE_DEAD_CHILD));
-+ WARNING((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_DEAD_CHILD));
- break;
- case SGE_DAEMONIZE_TIMEOUT:
-- WARNING((SGE_EVENT, MSG_UTI_DAEMONIZE_TIMEOUT));
-+ WARNING((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_TIMEOUT));
- break;
- }
- /* close read pipe */
-diff -up GE2011.11p1/source/libs/uti/sge_stdio.c.format GE2011.11p1/source/libs/uti/sge_stdio.c
---- GE2011.11p1/source/libs/uti/sge_stdio.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_stdio.c 2014-10-03 21:11:16.342852591 -0600
-@@ -409,7 +409,7 @@ pid_t sge_peopen_r(const char *shell, in
- DRETURN(-1);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_UTI_MEMPWNAM));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MEMPWNAM));
- FREE(buffer);
- if (sge_has_admin_user()) {
- sge_switch2admin_user();
-@@ -429,7 +429,7 @@ pid_t sge_peopen_r(const char *shell, in
-
- if (myuid != SGE_SUPERUSER_UID) {
- DPRINTF(("only root is allowed to switch to a different user\n"));
-- ERROR((SGE_EVENT, MSG_SYSTEM_NOROOTRIGHTSTOSWITCHUSER));
-+ ERROR((SGE_EVENT, "%s", MSG_SYSTEM_NOROOTRIGHTSTOSWITCHUSER));
- FREE(buffer);
- DRETURN(-2);
- }
-diff -up GE2011.11p1/source/libs/uti/sge_stdlib.c.format GE2011.11p1/source/libs/uti/sge_stdlib.c
---- GE2011.11p1/source/libs/uti/sge_stdlib.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_stdlib.c 2014-10-03 21:11:16.342852591 -0600
-@@ -74,7 +74,7 @@ char *sge_malloc(int size)
-
- cp = (char *) malloc(size);
- if (!cp) {
-- CRITICAL((SGE_EVENT, MSG_MEMORY_MALLOCFAILED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_MALLOCFAILED));
- DEXIT_;
- abort();
- }
-@@ -117,7 +117,7 @@ void *sge_realloc(void *ptr, int size, i
-
- cp = realloc(ptr, size);
- if (cp == NULL) {
-- CRITICAL((SGE_EVENT, MSG_MEMORY_REALLOCFAILED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_REALLOCFAILED));
- if (do_abort) {
- DEXIT;
- abort();
-diff -up GE2011.11p1/source/libs/uti/sge_string.c.format GE2011.11p1/source/libs/uti/sge_string.c
---- GE2011.11p1/source/libs/uti/sge_string.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_string.c 2014-10-03 21:11:16.342852591 -0600
-@@ -387,7 +387,7 @@ char *sge_strtok_r(const char *str, cons
-
- if (str != NULL) {
- if (*context != NULL) {
-- ERROR((SGE_EVENT, MSG_POINTER_INVALIDSTRTOKCALL));
-+ ERROR((SGE_EVENT, "%s", MSG_POINTER_INVALIDSTRTOKCALL));
- }
- *context = (struct saved_vars_s *)malloc(sizeof(struct saved_vars_s));
- memset(*context, 0, sizeof(struct saved_vars_s));
-@@ -399,7 +399,7 @@ char *sge_strtok_r(const char *str, cons
- saved_cp = saved->static_str;
- } else {
- if (*context == NULL) {
-- ERROR((SGE_EVENT, MSG_POINTER_INVALIDSTRTOKCALL1));
-+ ERROR((SGE_EVENT, "%s", MSG_POINTER_INVALIDSTRTOKCALL1));
- DRETURN(NULL);
- }
- saved = *context;
-diff -up GE2011.11p1/source/libs/uti/sge_uidgid.c.format GE2011.11p1/source/libs/uti/sge_uidgid.c
---- GE2011.11p1/source/libs/uti/sge_uidgid.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_uidgid.c 2014-10-03 21:11:16.343852615 -0600
-@@ -242,7 +242,7 @@ int sge_set_admin_username(const char *u
- }
- if (!user || user[0] == '\0') {
- if (err_str) {
-- sprintf(err_str, MSG_POINTER_SETADMINUSERNAMEFAILED);
-+ sprintf(err_str, "%s", MSG_POINTER_SETADMINUSERNAMEFAILED);
- }
- DEXIT;
- return -1;
-@@ -353,7 +353,7 @@ int sge_switch2admin_user(void)
- DENTER(UIDGID_LAYER, "sge_switch2admin_user");
-
- if (get_admin_user(&uid, &gid) == ESRCH) {
-- CRITICAL((SGE_EVENT, MSG_SWITCH_USER_NOT_INITIALIZED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_INITIALIZED));
- abort();
- }
-
-@@ -425,7 +425,7 @@ int sge_switch2start_user(void)
- DENTER(UIDGID_LAYER, "sge_switch2start_user");
-
- if (get_admin_user(&uid, &gid) == ESRCH) {
-- CRITICAL((SGE_EVENT, MSG_SWITCH_USER_NOT_INITIALIZED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_INITIALIZED));
- abort();
- }
-
-@@ -979,7 +979,7 @@ static int _sge_set_uid_gid_addgrp(const
- sge_switch2start_user();
-
- if (!sge_is_start_user_superuser()) {
-- sprintf(err_str, MSG_SYSTEM_CHANGEUIDORGIDFAILED );
-+ sprintf(err_str, "%s", MSG_SYSTEM_CHANGEUIDORGIDFAILED );
- return -1;
- }
-
-diff -up GE2011.11p1/source/libs/uti/sge_unistd.c.format GE2011.11p1/source/libs/uti/sge_unistd.c
---- GE2011.11p1/source/libs/uti/sge_unistd.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_unistd.c 2014-10-03 21:11:16.343852615 -0600
-@@ -157,7 +157,7 @@ bool sge_unlink(const char *prefix, cons
- DENTER(TOP_LAYER, "sge_unlink");
-
- if (!suffix) {
-- ERROR((SGE_EVENT, MSG_POINTER_SUFFIXISNULLINSGEUNLINK ));
-+ ERROR((SGE_EVENT, "%s", MSG_POINTER_SUFFIXISNULLINSGEUNLINK ));
- DEXIT;
- return false;
- }
-@@ -349,11 +349,11 @@ int sge_mkdir(const char *path, int fmod
- DENTER(TOP_LAYER, "sge_mkdir");
- if (!path) {
- if (exit_on_error) {
-- CRITICAL((SGE_EVENT,MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DCLOSE;
- SGE_EXIT(NULL, 1);
- } else {
-- ERROR((SGE_EVENT, MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ ERROR((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DEXIT;
- return -1;
- }
-@@ -394,11 +394,11 @@ int sge_mkdir2(const char *base_dir, con
-
- if (base_dir == NULL || name == NULL) {
- if (exit_on_error) {
-- CRITICAL((SGE_EVENT,MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DCLOSE;
- SGE_EXIT(NULL, 1);
- } else {
-- ERROR((SGE_EVENT, MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ ERROR((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DRETURN(-1);
- }
- }
-diff -up GE2011.11p1/source/libs/uti/test_sge_profiling.c.format GE2011.11p1/source/libs/uti/test_sge_profiling.c
---- GE2011.11p1/source/libs/uti/test_sge_profiling.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/test_sge_profiling.c 2014-10-03 21:11:16.344852638 -0600
-@@ -118,25 +118,25 @@ int do_test () {
- /* if (thread_prof_active_by_id(pthread_self()) == true ) {*/
-
- if(!prof_start(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "Main Loop", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_OTHER, "other", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -180,7 +180,7 @@ int do_test () {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_reset(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -189,13 +189,13 @@ int do_test () {
- printf("%s\n", prof_get_info_string(SGE_PROF_CUSTOM1, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_stop(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -214,31 +214,31 @@ void* do_sleep(void* p) {
- /* if (thread_prof_active_by_id(pthread_self()) == true ) {*/
-
- if(!prof_start(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_start(SGE_PROF_CUSTOM2, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "sleep thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM2, "sleep_thread_printf", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -261,19 +261,19 @@ void* do_sleep(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_stop(SGE_PROF_CUSTOM2, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_stop(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -293,13 +293,13 @@ void* do_calc(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) { */
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "calc thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -327,7 +327,7 @@ void* do_calc(void* p) {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -348,13 +348,13 @@ void* do_calc2(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "calc2 thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -373,7 +373,7 @@ void* do_calc2(void* p) {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -395,13 +395,13 @@ void* do_malloc(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "malloc thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -419,7 +419,7 @@ void* do_malloc(void* p) {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-diff -up GE2011.11p1/source/utilbin/authuser.c.format GE2011.11p1/source/utilbin/authuser.c
---- GE2011.11p1/source/utilbin/authuser.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/authuser.c 2014-10-03 21:11:16.344852638 -0600
-@@ -158,7 +158,7 @@ static void usage(void) {
- static void print_error(const char* format, ...) {
- va_list ap;
- va_start(ap, format);
-- fprintf(stderr, MSG_AUTHUSER_ERROR);
-+ fprintf(stderr, "%s", MSG_AUTHUSER_ERROR);
- vfprintf(stderr, format, ap);
- fprintf(stderr, "\n");
- va_end(ap);
-diff -up GE2011.11p1/source/utilbin/checkprog.c.format GE2011.11p1/source/utilbin/checkprog.c
---- GE2011.11p1/source/utilbin/checkprog.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/checkprog.c 2014-10-03 21:11:16.345852661 -0600
-@@ -58,7 +58,7 @@ int i
- void usage_checkprog(void)
- {
- fprintf(stderr, "\n");
-- fprintf(stderr, MSG_COMMAND_USAGECHECKPROG);
-+ fprintf(stderr,"%s", MSG_COMMAND_USAGECHECKPROG);
- fprintf(stderr, "\n");
- /*fprintf(stderr, "check the first 8 letters of process basename\n\n");
- fprintf(stderr, "exit status: 0 if process was found\n");
-@@ -71,7 +71,7 @@ void usage_checkprog(void)
- void usage_getprogs(void)
- {
- fprintf(stderr, "\n");
-- fprintf(stderr,MSG_COMMAND_USAGEGETPROGS );
-+ fprintf(stderr,"%s", MSG_COMMAND_USAGEGETPROGS );
- fprintf(stderr, "\n");
- /*
- fprintf(stderr, "check and list pids of \"processname\"\n\n");
-@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
- else if (!strcmp(ptr, "getprogs"))
- checkit = 0;
- else {
-- fprintf(stderr, MSG_COMMAND_CALLCHECKPROGORGETPROGS );
-+ fprintf(stderr, "%s", MSG_COMMAND_CALLCHECKPROGORGETPROGS );
- fprintf(stderr, "\n");
- exit(1);
- }
-@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
- else if (res == 0)
- printf(MSG_PROC_PIDISRUNNINGWITHNAME_IS , (int) pid, argv[2]);
- else if (res == -1)
-- printf(MSG_COMMAND_SPANPSFAILED );
-+ printf("%s", MSG_COMMAND_SPANPSFAILED );
-
- if (res == -1)
- res = 2;
-diff -up GE2011.11p1/source/utilbin/gethostbyaddr.c.format GE2011.11p1/source/utilbin/gethostbyaddr.c
---- GE2011.11p1/source/utilbin/gethostbyaddr.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/gethostbyaddr.c 2014-10-03 21:11:16.345852661 -0600
-@@ -212,13 +212,13 @@ int main(int argc, char *argv[])
- }
-
- if (he != NULL) {
-- printf(MSG_SYSTEM_ALIASES );
-+ printf("%s", MSG_SYSTEM_ALIASES );
-
- for (tp = he->h_aliases; *tp; tp++)
- printf("%s ", *tp);
- printf("\n");
-
-- printf(MSG_SYSTEM_ADDRESSES );
-+ printf("%s", MSG_SYSTEM_ADDRESSES );
-
- for (tp2 = he->h_addr_list; *tp2; tp2++)
- printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */
-diff -up GE2011.11p1/source/utilbin/gethostbyname.c.format GE2011.11p1/source/utilbin/gethostbyname.c
---- GE2011.11p1/source/utilbin/gethostbyname.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/gethostbyname.c 2014-10-03 21:11:16.345852661 -0600
-@@ -157,13 +157,13 @@ int main(int argc, char *argv[]) {
- printf("SGE name: %s\n",resolved_name);
- }
-
-- printf(MSG_SYSTEM_ALIASES );
-+ printf("%s", MSG_SYSTEM_ALIASES );
-
- for (tp = he->h_aliases; *tp; tp++)
- printf("%s ", *tp);
- printf("\n");
-
-- printf(MSG_SYSTEM_ADDRESSES );
-+ printf("%s", MSG_SYSTEM_ADDRESSES );
- for (tp2 = he->h_addr_list; *tp2; tp2++)
- printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */
- printf("\n");
-diff -up GE2011.11p1/source/utilbin/gethostname.c.format GE2011.11p1/source/utilbin/gethostname.c
---- GE2011.11p1/source/utilbin/gethostname.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/gethostname.c 2014-10-03 21:11:16.345852661 -0600
-@@ -149,13 +149,13 @@ int main(int argc,char *argv[]) {
- printf("SGE name: %s\n",resolved_name);
- }
-
-- printf(MSG_SYSTEM_ALIASES );
-+ printf("%s", MSG_SYSTEM_ALIASES );
-
- for (tp = he->h_aliases; *tp; tp++)
- printf("%s ", *tp);
- printf("\n");
-
-- printf(MSG_SYSTEM_ADDRESSES );
-+ printf("%s", MSG_SYSTEM_ADDRESSES );
- for (tp2 = he->h_addr_list; *tp2; tp2++)
- printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */
- printf("\n");
-diff -up GE2011.11p1/source/utilbin/loadcheck.c.format GE2011.11p1/source/utilbin/loadcheck.c
---- GE2011.11p1/source/utilbin/loadcheck.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/loadcheck.c 2014-10-03 21:11:16.346852685 -0600
-@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
- memset(&mem_info, 0, sizeof(sge_mem_info_t));
- if (sge_loadmem(&mem_info))
- {
-- fprintf(stderr, MSG_SYSTEM_RETMEMORYINDICESFAILED );
-+ fprintf(stderr, "%s", MSG_SYSTEM_RETMEMORYINDICESFAILED );
- fprintf(stderr, "\n");
- #ifndef WINDOWS
- DEXIT;
-diff -up GE2011.11p1/source/utilbin/qping.c.format GE2011.11p1/source/utilbin/qping.c
---- GE2011.11p1/source/utilbin/qping.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/qping.c 2014-10-03 21:11:16.346852685 -0600
-@@ -365,7 +365,7 @@ static void qping_print_line(const char*
- help[0]=0;
- if (help2) {
- snprintf(help_buffer,1024,"%s%s", cl_values[1], help2);
-- snprintf(cl_values[1],1024, help_buffer);
-+ snprintf(cl_values[1],1024, "%s", help_buffer);
- }
- }
-
-@@ -376,7 +376,7 @@ static void qping_print_line(const char*
- help[0]=0;
- if (help2) {
- snprintf(help_buffer,1024,"%s%s", cl_values[3], help2);
-- snprintf(cl_values[3],1024, help_buffer);
-+ snprintf(cl_values[3],1024, "%s", help_buffer);
- }
- }
-
-diff -up GE2011.11p1/source/utilbin/sge_passwd.c.format GE2011.11p1/source/utilbin/sge_passwd.c
---- GE2011.11p1/source/utilbin/sge_passwd.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/sge_passwd.c 2014-10-03 21:11:16.347852708 -0600
-@@ -295,7 +295,7 @@ sge_get_file_pub_key(void)
- const char *cert = getenv("SGE_CERTFILE");
-
- if (cert != NULL) {
-- snprintf(file, 4096, cert);
-+ snprintf(file, 4096, "%s", cert);
- } else {
- const char *sge_root = sge_get_root_dir(0, NULL, 0, 1);
- const char *sge_cell = sge_get_default_cell();
-@@ -655,7 +655,7 @@ buffer_decrypt(const char *buffer_in, si
- snprintf(err_str, MAX_STRING_SIZE, MSG_PWD_LOAD_PRIV_SSS,
- SGE_PASSWD_PROG_NAME, file_priv_key, err_msg);
- #ifdef DEFINE_SGE_PASSWD_MAIN
-- fprintf(stderr, err_str);
-+ fprintf(stderr, "%s", err_str);
- #endif
- DEXIT;
- return 1;
-@@ -685,7 +685,7 @@ buffer_decrypt(const char *buffer_in, si
- snprintf(err_str, MAX_STRING_SIZE, MSG_PWD_MALLOC_SS,
- SGE_PASSWD_PROG_NAME, err_msg);
- #ifdef DEFINE_SGE_PASSWD_MAIN
-- fprintf(stderr, err_str);
-+ fprintf(stderr, "%s", err_str);
- #endif
- DEXIT;
- return 1;
-@@ -1198,7 +1198,7 @@ sge_passwd_add_change(const char *userna
- password_write_file(users, encryped_pwd,
- sge_get_file_dotpasswd(), sge_get_file_passwd());
- DPRINTF(("password table has been written\n"));
-- fprintf(stdout, MSG_PWD_CHANGED);
-+ fprintf(stdout, "%s", MSG_PWD_CHANGED);
- fprintf(stdout, "\n");
- DEXIT;
- }
-diff -up GE2011.11p1/source/utilbin/spooldefaults.c.format GE2011.11p1/source/utilbin/spooldefaults.c
---- GE2011.11p1/source/utilbin/spooldefaults.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/spooldefaults.c 2014-10-03 21:11:16.347852708 -0600
-@@ -113,13 +113,13 @@ static int init_framework(sge_gdi_ctx_cl
- spooling_params);
- answer_list_output(&answer_list);
- if (spooling_context == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
- } else {
- spool_set_default_context(spooling_context);
-
- /* initialize spooling context */
- if (!spool_startup_context(&answer_list, spooling_context, true)) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
- } else {
- ret = EXIT_SUCCESS;
- }
-diff -up GE2011.11p1/source/utilbin/spooledit.c.format GE2011.11p1/source/utilbin/spooledit.c
---- GE2011.11p1/source/utilbin/spooledit.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/spooledit.c 2014-10-03 21:11:16.347852708 -0600
-@@ -97,9 +97,9 @@ init_framework(sge_gdi_ctx_class_t *ctx,
- spooling_params);
- answer_list_output(&answer_list);
- if (!strcmp(bootstrap_get_spooling_method(),"classic")) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANTHANDLECLASSICSPOOLING));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANTHANDLECLASSICSPOOLING));
- } else if (spooling_context == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
- } else {
- spool_set_default_context(spooling_context);
- spool_set_option(&answer_list, spooling_context, "recover=false");
-@@ -107,7 +107,7 @@ init_framework(sge_gdi_ctx_class_t *ctx,
-
- /* initialize spooling context */
- if (!spool_startup_context(&answer_list, spooling_context, true)) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
- } else {
- /* search the berkeley db info - take it from any object type,
- * berkeleydb spools all objects using the same rule.
-@@ -264,7 +264,7 @@ dump_object(bdb_info info, const char *k
- answer_list_output(&answer_list);
- ret = EXIT_FAILURE;
- } else {
-- printf(job_script);
-+ printf("%s", job_script);
- FREE(job_script);
- }
- } else {
-diff -up GE2011.11p1/source/utilbin/spoolinit.c.format GE2011.11p1/source/utilbin/spoolinit.c
---- GE2011.11p1/source/utilbin/spoolinit.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/spoolinit.c 2014-10-03 21:11:16.347852708 -0600
-@@ -83,14 +83,14 @@ static int init_framework(const char *me
- libargs);
- answer_list_output(&answer_list);
- if (spooling_context == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
- } else {
- spool_set_default_context(spooling_context);
-
- /* initialize spooling context */
- if (!spool_startup_context(&answer_list, spooling_context,
- check_context)) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
- } else {
- ret = EXIT_SUCCESS;
- }
diff --git a/gridengine-ldflags.patch b/gridengine-ldflags.patch
deleted file mode 100644
index a82955a..0000000
--- a/gridengine-ldflags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -up GE2011.11p1/source/aimk.ldflags GE2011.11p1/source/aimk
---- GE2011.11p1/source/aimk.ldflags 2012-05-23 13:05:00.000000000 -0600
-+++ GE2011.11p1/source/aimk 2013-05-21 09:41:04.639062331 -0600
-@@ -314,7 +314,7 @@ set JNI_TARGET = "ALL"
- set PROTECTED = 0
- set RUNPATH = ""
-
--set LFLAGS = "-L."
-+set LFLAGS = "$LDFLAGS -L."
- set XLFLAGS = ""
- set XLIBS = ""
- set XMLIBS = ""
-diff -up GE2011.11p1/source/clients/qmon/Makefile.ldflags GE2011.11p1/source/clients/qmon/Makefile
---- GE2011.11p1/source/clients/qmon/Makefile.ldflags 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/Makefile 2013-05-21 12:00:46.266888889 -0600
-@@ -152,7 +152,7 @@ messages:
- # rules to build binaries
- ###############################################################################
- qmon: $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_LIB_DEPENDS)
-- $(LD_WRAPPER) $(CC) $(LFLAGS) $(LDFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS)
-+ $(LD_WRAPPER) $(CC) $(LFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS)
-
- ############################################################################
- # ListTree Demo prog
---- GE2011.11p1/source/3rdparty/qtcsh/Makefile.in.ldflags 2012-05-23 13:04:53.000000000 -0600
-+++ GE2011.11p1/source/3rdparty/qtcsh/Makefile.in 2013-05-21 12:19:25.286578827 -0600
-@@ -335,19 +335,19 @@
-
- tcsh:$(P) ${OBJS}
- rm -f tcsh core
-- ${CC} -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
-+ ${CC} -o tcsh ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
-
- # Purify
- pure:$(P) ${OBJS}
- rm -f tcsh core
-- purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
-+ purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
- # OS/2
- tcsh.exe: tcsh
- emxbind tcsh
-
- gethost: gethost.c sh.err.h tc.const.h sh.h
- rm -f gethost
-- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
-+ ${CC} -o gethost ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
-
- tc.defs.c: gethost host.defs
- @rm -f $@
---- GE2011.11p1/source/3rdparty/qtcsh/configure.ldflags 2012-05-23 13:04:53.000000000 -0600
-+++ GE2011.11p1/source/3rdparty/qtcsh/configure 2013-05-21 15:53:06.286076742 -0600
-@@ -2691,7 +2691,7 @@
- fi;
- if test "$sge" != no; then
- GRDDEF="-I../../../libs/gdi"
-- GRDLIB="-L../../../$sge \$(SGE_LIBS) ${LDFLAGS}"
-+ GRDLIB="-L../../../$sge \$(SGE_LIBS)"
- CFLAGS="$CFLAGS -DPROG_NAME='\"qtcsh\"' -D$sge"
- fi
-
diff --git a/gridengine-loadsensor.patch b/gridengine-loadsensor.patch
deleted file mode 100644
index 13aba86..0000000
--- a/gridengine-loadsensor.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -up source/daemons/execd/sge_load_sensor.c.loadsensor source/daemons/execd/sge_load_sensor.c
---- source/daemons/execd/sge_load_sensor.c.loadsensor 2012-05-23 13:04:38.000000000 -0600
-+++ source/daemons/execd/sge_load_sensor.c 2012-10-03 15:10:46.129014819 -0600
-@@ -168,7 +168,7 @@ static int sge_ls_status(lListElem *this
- {
- fd_set writefds;
- int ret;
-- int higest_fd;
-+ int highest_fd;
-
- DENTER(TOP_LAYER, "sge_ls_status");
-
-@@ -178,11 +178,11 @@ static int sge_ls_status(lListElem *this
-
- /* build writefds */
- FD_ZERO(&writefds);
-- higest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-- FD_SET(higest_fd, &writefds);
-+ highest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-+ FD_SET(highest_fd, &writefds);
-
- /* is load sensor ready to read ? */
-- ret = select(higest_fd + 1, NULL, &writefds, NULL, NULL);
-+ ret = select(highest_fd + 1, NULL, &writefds, NULL, NULL);
-
- if (ret <= 0) {
- DRETURN(LS_BROKEN_PIPE);
-@@ -263,9 +263,6 @@ static int sge_ls_start_ls(const char *q
- DPRINTF(("%s: successfully started load sensor \"%s\"\n",
- SGE_FUNC, lGetString(this_ls, LS_command)));
-
-- /* request first load report after starting */
-- ls_send_command(this_ls, "\n");
--
- return LS_OK;
- }
-
-@@ -431,6 +428,11 @@ static int read_ls(void)
- char value[1000];
- lListElem *ls_elem;
- bool flag = true;
-+ fd_set readfds;
-+ struct timeval timeleft;
-+ int wait = 1;
-+ int highest_fd;
-+ int ret;
-
- DENTER(TOP_LAYER, "read_ls");
-
-@@ -441,10 +443,46 @@ static int read_ls(void)
- continue;
- }
-
-+ /* request load report from ls */
-+ ls_send_command(ls_elem, "\n");
-+
- DPRINTF(("receiving from %s\n", lGetString(ls_elem, LS_command)));
-
-+ highest_fd = fileno(file);
- while (flag) {
- if (fscanf(file, "%[^\n]\n", input) != 1) {
-+ FD_ZERO(&readfds);
-+ FD_SET(highest_fd, &readfds);
-+
-+ /* wait up to 1 second per line for reading report */
-+ timeleft.tv_sec = wait;
-+ timeleft.tv_usec = 0;
-+ ret = select(highest_fd + 1, &readfds, NULL, NULL, &timeleft);
-+ if (ret == -1) {
-+ switch (errno) {
-+ case EINTR:
-+ DPRINTF(("select failed with EINTR\n"));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EINTR", lGetString(ls_elem, LS_pid)));
-+ break;
-+ case EBADF:
-+ DPRINTF(("select failed with EBADF\n"));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EBADF", lGetString(ls_elem, LS_pid)));
-+ break;
-+ case EINVAL:
-+ DPRINTF(("select failed with EINVAL\n"));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EINVAL", lGetString(ls_elem, LS_pid)));
-+ break;
-+ default:
-+ DPRINTF(("select failed with unexpected errno %d", errno));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with [%s]", lGetString(ls_elem, LS_pid), strerror(errno)));
-+ }
-+ DRETURN(-1);
-+ }
-+
-+ /* if something is there now, go back and read it */
-+ if (ret) continue;
-+
-+ /* nothing to read, so exit */
- break;
- }
- #ifdef INTERIX
-@@ -467,9 +505,9 @@ static int read_ls(void)
- lXchgList(ls_elem, LS_complete, &tmp_list);
- lFreeList(&tmp_list);
-
-- /* request next load report from ls */
-- ls_send_command(ls_elem, "\n");
-- break;
-+ /* see without waiting if there is any backlog to process, we'll exit if fscanf fails */
-+ wait = 0;
-+ continue;
- }
-
- /* add a newline for pattern matching in sscanf */
-@@ -524,19 +562,19 @@ static int ls_send_command(lListElem *th
- struct timeval timeleft;
- int ret;
- FILE *file;
-- int higest_fd;
-+ int highest_fd;
-
- DENTER(TOP_LAYER, "ls_send_command");
-
- FD_ZERO(&writefds);
-- higest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-- FD_SET(higest_fd, &writefds);
-+ highest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-+ FD_SET(highest_fd, &writefds);
-
- timeleft.tv_sec = 0;
- timeleft.tv_usec = 0;
-
- /* wait for writing on fd_in */
-- ret = select(higest_fd + 1, NULL, &writefds, NULL, &timeleft);
-+ ret = select(highest_fd + 1, NULL, &writefds, NULL, &timeleft);
- if (ret == -1) {
- switch (errno) {
- case EINTR:
diff --git a/gridengine-mingw.patch b/gridengine-mingw.patch
deleted file mode 100644
index de47b6b..0000000
--- a/gridengine-mingw.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up GE2011.11/source/aimk.mingw GE2011.11/source/aimk
---- GE2011.11/source/aimk.mingw 2012-03-21 15:04:40.985356138 -0600
-+++ GE2011.11/source/aimk 2012-03-21 15:35:53.436004441 -0600
-@@ -46,7 +46,7 @@ unsetenv AIMK_INSURE AIMK_TARGET_BITS ai
-
- set COMPILE_ARCH = ""
- set COMPILE_DIR = ""
--set buildarch = UNKNOWN
-+set buildarch = mingw32
- set WINCC = ""
- set WINCFLAGS = ""
- set WINLFLAGS = ""
-@@ -177,6 +177,7 @@ usage:
- echo " -kerberos -> enable kerberos authentication"
- echo " -man -> generate man pages"
- echo " -mankv -> generate man pages checked out with '-kv' flag"
-+ echo " -mingw32 -> compile with mingw32"
- echo " -mo -> generate the message catalogues (Solaris only)"
- echo " -no-core -> don't compile the core system"
- echo " -no-java -> don't compile Java[TM] class files"
-@@ -643,6 +644,10 @@ while ($#argv >= 1 && $?found)
- set BUILDMAN = 1
- set KVMAN = 1
- breaksw
-+ case "-mingw32":
-+ set buildarch = mingw32
-+ set BUILDARCH = `scripts/compilearch -b $buildarch`
-+ breaksw
- case "-mo"
- echo "BUILDARCH=$BUILDARCH"
- if ( $BUILDARCH == sol-sparc || $BUILDARCH == sol-sparc64 ) then
-@@ -1763,6 +1768,17 @@ case CYGWIN_X86:
-
- breaksw
-
-+case MINGW32:
-+ set WINCC = i686-pc-mingw32-gcc
-+ set HWLOC = 0
-+ set MAKEHWLOC = 0
-+ set DEPEND_FLAGS = "$CFLAGS"
-+ set RM = "rm -f"
-+ # Default build targets for WIN32_X86 for which we have seperate make files
-+ set MAKEWINGRIDLIB = 1
-+ set MAKEWINGRIDAPP = 1
-+ breaksw
-+
- case WIN32_X86:
- setenv LD_LIBRARY_PATH /usr/lib/x86:/usr/local/lib
- set CC = gcc
-diff -up GE2011.11/source/libs/comm/cl_data_types.h.mingw GE2011.11/source/libs/comm/cl_data_types.h
-diff -up GE2011.11/source/scripts/compilearch.mingw GE2011.11/source/scripts/compilearch
---- GE2011.11/source/scripts/compilearch.mingw 2012-03-21 15:04:40.657367886 -0600
-+++ GE2011.11/source/scripts/compilearch 2012-03-21 15:04:41.013355134 -0600
-@@ -228,6 +228,10 @@ case $buildarch in
- BUILDARCH=LINUXX64
- TARGET_BITS=TARGET_64BIT
- ;;
-+ mingw32)
-+ BUILDARCH=MINGW32
-+ TARGET_BITS=TARGET_32BIT
-+ ;;
- necsx4)
- BUILDARCH=NECSX4
- TARGET_BITS=TARGET_64BIT
diff --git a/gridengine-rctemplates.patch b/gridengine-rctemplates.patch
deleted file mode 100644
index fa8caac..0000000
--- a/gridengine-rctemplates.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-diff -up GE2011.11p1/source/dist/inst_sge.rctemplates GE2011.11p1/source/dist/inst_sge
---- GE2011.11p1/source/dist/inst_sge.rctemplates 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/dist/inst_sge 2012-07-09 14:11:10.645922508 -0600
-@@ -702,8 +702,7 @@ if [ "$UPDATE" = true ]; then
- AddJMXFiles
- fi
- RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
-- CreateSGEStartUpScripts $euid true master
-- CreateSGEStartUpScripts $euid true execd
-+ SetupDefaultUsers $euid
- CreateSettingsFile
- InitCA
- SetupRcScriptNames master #New qmaster RC script/SMF
-@@ -867,7 +866,6 @@ if [ "$BERKELEY" = "install" ]; then
- Makedir $COMMONDIR
- ProcessSGEClusterName "bdb"
- SetSpoolingOptions
-- AddSGEStartUpScript $euid "bdb"
- PrepareRPCServerStart
- GiveBerkelyHints
- else
-@@ -919,11 +917,9 @@ if [ "$QMASTER" = "install" -a "$UPDATE"
- AddDefaultUsersets
- AddCommonFiles
- AddJMXFiles
-- CreateSGEStartUpScripts $euid true master
-- CreateSGEStartUpScripts $euid true execd
-+ SetupDefaultUsers $euid
- CreateSettingsFile
- InitCA
-- AddSGEStartUpScript $euid master
- StartQmaster
- AddWindowsAdmin
- AddHosts
-@@ -1091,7 +1087,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
- GetLocalExecdSpoolDir
- AddLocalConfiguration_With_Qconf
- AddSubmitHostsExecd
-- AddSGEStartUpScript $euid execd
- SetupWinSvc execinst #service install during execd installation -> param: execinst
- # CopyIBMLoadSensor
- StartExecd
-@@ -1127,7 +1122,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
- CheckHostNameResolving install
- GetLocalExecdSpoolDir
- AddLocalConfiguration_With_Qconf
-- AddSGEStartUpScript $euid execd
- SetupWinSvc execinst #service install during execd installation -> param: execinst
- # CopyIBMLoadSensor
- StartExecd
-@@ -1444,7 +1438,6 @@ if [ $SHADOW = "install" ]; then
- if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
- . $SGE_ROOT/$SGE_CELL/common/settings.sh
- SGE_ARCH=`$SGE_ROOT/util/arch`
-- AddSGEStartUpScript $euid shadow
- $INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
- $INFOTEXT -log "Starting sge_shadowd on host %s\n" $SHADOW_HOST
- if [ "$SGE_ENABLE_SMF" = "true" ]; then
-@@ -1690,20 +1683,7 @@ if [ $MAKE_RC = "true" ]; then
-
- COMMONDIR=$SGE_CELL/common
-
-- CreateSGEStartUpScripts 0 true master
-- CreateSGEStartUpScripts 0 true execd
--
-- $INFOTEXT "\nYour new startup scripts are created. You will find them in the\n" \
-- "directory:\n\n" \
-- " %s\n\n" \
-- "Your old startup scripts are saved in this directory as\n\n" \
-- " %s\n" \
-- " %s\n\n" \
-- \$SGE_ROOT/$COMMONDIR sgemaster_$DATE sgeexecd_$DATE
--
-- $INFOTEXT "Please now copy the new startup scripts to the system wide rc\n" \
-- "file location on all qmaster, shadowd and execution hosts."
--
-+ SetupDefaultUser 0
- fi
-
- exit 0
-diff -up GE2011.11p1/source/dist/util/create_settings.sh.rctemplates GE2011.11p1/source/dist/util/create_settings.sh
---- GE2011.11p1/source/dist/util/create_settings.sh.rctemplates 2012-05-23 13:04:48.000000000 -0600
-+++ GE2011.11p1/source/dist/util/create_settings.sh 2012-07-09 14:14:11.614473681 -0600
-@@ -67,8 +67,6 @@ SP_SH=$1/settings.sh
- echo "setenv SGE_ROOT $SGE_ROOT" > $SP_CSH
- echo "" >> $SP_CSH
- echo "set ARCH = \`\$SGE_ROOT/util/arch\`" >> $SP_CSH
--echo "set DEFAULTMANPATH = \`\$SGE_ROOT/util/arch -m\`" >> $SP_CSH
--echo "set MANTYPE = \`\$SGE_ROOT/util/arch -mt\`" >> $SP_CSH
- echo "" >> $SP_CSH
-
- #if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then
-@@ -93,31 +91,9 @@ fi
-
-
- echo "" >> $SP_CSH
--echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_CSH
--echo 'if ( $?MANPATH == 1 ) then' >> $SP_CSH
--echo " setenv MANPATH \$SGE_ROOT/"'${MANTYPE}':'$MANPATH' >> $SP_CSH
--echo "else" >> $SP_CSH
--echo " setenv MANPATH \$SGE_ROOT/"'${MANTYPE}:$DEFAULTMANPATH' >> $SP_CSH
--echo "endif" >> $SP_CSH
--echo "" >> $SP_CSH
- echo "set path = ( \$SGE_ROOT/bin/"'$ARCH $path )' >> $SP_CSH
-
--echo 'switch ($ARCH)' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo 'case "sol*":' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo 'case "linux-*":' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo 'case "hp11-64":' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo ' breaksw' >> $SP_CSH
--echo 'case "*":' >> $SP_CSH
--echo " set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`" >> $SP_CSH
--echo " if ( \`eval echo '\$?'\$shlib_path_name\` ) then" >> $SP_CSH
--echo " set old_value = \`eval echo '\$'\$shlib_path_name\`" >> $SP_CSH
--echo " setenv \$shlib_path_name \"\$SGE_ROOT/lib/\$ARCH\":\"\$old_value\"" >> $SP_CSH
--echo " else" >> $SP_CSH
--echo " setenv \$shlib_path_name \$SGE_ROOT/lib/\$ARCH" >> $SP_CSH
--echo " endif" >> $SP_CSH
--echo " unset shlib_path_name old_value" >> $SP_CSH
--echo "endsw" >> $SP_CSH
--echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_CSH
-+echo "unset ARCH" >> $SP_CSH
-
- #
- # bourne shell settings file
-@@ -126,8 +102,6 @@ echo "unset ARCH DEFAULTMANPATH MANTYPE"
- echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT" > $SP_SH
- echo "" >> $SP_SH
- echo "ARCH=\`\$SGE_ROOT/util/arch\`" >> $SP_SH
--echo "DEFAULTMANPATH=\`\$SGE_ROOT/util/arch -m\`" >> $SP_SH
--echo "MANTYPE=\`\$SGE_ROOT/util/arch -mt\`" >> $SP_SH
- echo "" >> $SP_SH
-
- if [ "$SGE_CELL" != "" ]; then
-@@ -151,28 +125,7 @@ fi
-
-
- echo "" >> $SP_SH
--echo "if [ \"\$MANPATH\" = \"\" ]; then" >> $SP_SH
--echo " MANPATH=\$DEFAULTMANPATH" >> $SP_SH
--echo "fi" >> $SP_SH
--echo "MANPATH=\$SGE_ROOT/\$MANTYPE:\$MANPATH; export MANPATH" >> $SP_SH
--echo "" >> $SP_SH
- echo "PATH=\$SGE_ROOT/bin/\$ARCH:\$PATH; export PATH" >> $SP_SH
-
--echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
--echo 'case $ARCH in' >> $SP_SH
--#ENFORCE_SHLIBPATH#echo 'sol*|linux-*|hp11-64)' >> $SP_SH
--#ENFORCE_SHLIBPATH#echo ' ;;' >> $SP_SH
--echo '*)' >> $SP_SH
--echo " shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`" >> $SP_SH
--echo " old_value=\`eval echo '\$'\$shlib_path_name\`" >> $SP_SH
--echo " if [ x\$old_value = "x" ]; then" >> $SP_SH
--echo " eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH" >> $SP_SH
--echo " else" >> $SP_SH
--echo " eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH:\$old_value" >> $SP_SH
--echo " fi" >> $SP_SH
--echo " export \$shlib_path_name" >> $SP_SH
--echo ' unset shlib_path_name old_value' >> $SP_SH
--echo ' ;;' >> $SP_SH
--echo 'esac' >> $SP_SH
--echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_SH
-+echo "unset ARCH" >> $SP_SH
-
-diff -up GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_common.sh
---- GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates 2012-07-09 14:11:10.565925359 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_common.sh 2012-07-09 14:11:10.650922330 -0600
-@@ -576,19 +576,16 @@ ErrUsage()
- #
- GetConfigFromFile()
- {
-- SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF
-- SGE_ENABLE_SMF=""
-+ SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF
-+ SGE_ENABLE_SMF=""
-+
-+ if [ $FILE != "undef" ]; then
-+ $INFOTEXT "Reading configuration from file %s" $FILE
-+ . $FILE
-+ else
-+ $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file"
-+ fi
-
-- IFS="
--"
-- if [ $FILE != "undef" ]; then
-- $INFOTEXT "Reading configuration from file %s" $FILE
-- . $FILE
-- else
-- $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file"
-- fi
-- IFS="
--"
- #-nosmf takes precedence over the value in the autoinstall template
- if [ "$SGE_ENABLE_SMF_LAST" = false ]; then
- SGE_ENABLE_SMF=false
-@@ -2373,20 +2370,28 @@ CreateSGEStartUpScripts()
-
- rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1
-
-- if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" -a $hosttype = "master" ]; then
-- AddDefaultManager root $ADMINUSER
-- AddDefaultOperator $ADMINUSER
-- elif [ $euid != 0 -a $hosttype = "master" ]; then
-- AddDefaultManager $USER
-- AddDefaultOperator $USER
-- fi
--
- $INFOTEXT "Creating >%s< script" $STARTUP_FILE_NAME
- fi
-
- }
-
-
-+#-------------------------------------------------------------------------
-+# SetupDefaultUsers: Add the default manager and operator
-+#
-+SetupDefaultUsers() {
-+ euid=$1
-+
-+ if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" ]; then
-+ AddDefaultManager root $ADMINUSER
-+ AddDefaultOperator $ADMINUSER
-+ elif [ $euid != 0 ]; then
-+ AddDefaultManager $USER
-+ AddDefaultOperator $USER
-+ fi
-+}
-+
-+
- #-------------------------------------------------------------------------
- # AddSGEStartUpScript: Add startup script to rc files if root installs
- #
-diff -up GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_execd.sh
---- GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates 2012-07-09 14:11:10.574925038 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_execd.sh 2012-07-09 14:11:10.651922294 -0600
-@@ -457,7 +457,7 @@ StartExecd()
- exit 1
- fi
- else
-- $SGE_STARTUP_FILE
-+ /sbin/service sge_execd start
- fi
- $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
- $CLEAR
-diff -up GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh
---- GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2012-07-09 14:11:10.597924218 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh 2012-07-09 14:11:10.653922222 -0600
-@@ -208,8 +208,8 @@ GetQmasterSpoolDir()
- "the qmaster daemon on other hosts (see the corresponding section in the\n" \
- "Grid Engine Installation and Administration Manual for details) the account\n" \
- "on the shadow master hosts also needs read/write access to this directory.\n\n" \
-- "Enter a qmaster spool directory [%s] >> " "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"
-- QMDIR=`Enter "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"`
-+ "Enter a qmaster spool directory [%s] >> " "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"
-+ QMDIR=`Enter "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"`
- done=true
- #If directory is not empty need now require a new one
- if [ -d "$QMDIR" ]; then
-@@ -747,6 +747,9 @@ AddBootstrap()
- ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap
- PrintBootstrap >> $COMMONDIR/bootstrap
- ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap
-+ rm -f /etc/sysconfig/gridengine
-+ echo "SGE_ROOT=/usr/share/gridengine" >> /etc/sysconfig/gridengine
-+ echo "SGE_CELL=$SGE_CELL" >> /etc/sysconfig/gridengine
- }
-
- #-------------------------------------------------------------------------
-@@ -963,7 +966,7 @@ GetConfiguration()
- fi
-
- if [ -z "$1" ]; then
-- default_value=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool
-+ default_value=/var/spool/gridengine/$SGE_CELL_VAL
- else
- default_value="$1"
- fi
-@@ -1206,6 +1209,7 @@ InitSysKs()
- touch /tmp/pwfile.$$
- chmod 600 /tmp/pwfile.$$
- echo "$SGE_JMX_SSL_KEYSTORE_PW" > /tmp/pwfile.$$
-+ ExecuteAsAdmin mkdir -p `dirname $SGE_JMX_SSL_KEYSTORE`
- OUTPUT=`$SGE_CA_CMD -sysks -ksout $SGE_JMX_SSL_KEYSTORE -kspwf /tmp/pwfile.$$ 2>&1`
- if [ $? != 0 ]; then
- $INFOTEXT "Error: Cannot create keystore $SGE_JMX_SSL_KEYSTORE\n$OUTPUT"
-@@ -1277,7 +1281,7 @@ StartQmaster()
- exit 1
- fi
- else
-- $SGE_STARTUP_FILE -qmaster
-+ /sbin/service sgemaster start
- if [ $? -ne 0 ]; then
- $INFOTEXT "sge_qmaster start problem"
- $INFOTEXT -log "sge_qmaster start problem"
-diff -up GE2011.11p1/source/scripts/distinst.rctemplates GE2011.11p1/source/scripts/distinst
---- GE2011.11p1/source/scripts/distinst.rctemplates 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/scripts/distinst 2012-07-09 14:11:10.655922152 -0600
-@@ -839,15 +839,9 @@ if [ $instcommon = true ]; then
- Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
- if [ $enforce_shlibpath = true ]; then
- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
- else
- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
- fi
-
-@@ -872,7 +866,6 @@ if [ $instcommon = true ]; then
-
- Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
- $DEST_SGE_ROOT/util/upgrade_modules \
-- $DEST_SGE_ROOT/util/rctemplates \
- $DEST_SGE_ROOT/util/resources \
- $DEST_SGE_ROOT/util/sgeCA \
- $DEST_SGE_ROOT/util/resources/calendars \
-@@ -897,7 +890,6 @@ if [ $instcommon = true ]; then
- $DEST_SGE_ROOT/util/resources/starter_methods/*
-
- Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
-- $DEST_SGE_ROOT/util/rctemplates/* \
- $DEST_SGE_ROOT/util/sgeCA/*.cnf \
- $DEST_SGE_ROOT/util/sgeSMF/*.xml \
- $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
---- GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh.rctemplates 2012-05-23 13:04:48.000000000 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh 2012-07-09 16:50:24.230166313 -0600
-@@ -281,11 +281,6 @@
- $INFOTEXT "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR
- $INFOTEXT -log "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR
- ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
--
-- if [ `ls -la $SPOOL_DIR | wc -l` -lt 4 ]; then
-- Removedir $SPOOL_DIR
-- fi
--
- fi
-
- $INFOTEXT "Checking local spooldir configuration for host \"%s\"!" $exechost
-@@ -305,9 +300,6 @@
- $INFOTEXT "Removing local spool directory [%s]" "$SPOOL_DIR/$HOST_DIR"
- $INFOTEXT -log "Removing local spool directory [%s]" "$SPOOL_DIR/$HOST_DIR"
- ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
-- if [ `ls -la $SPOOL_DIR | wc -l` -lt 4 ]; then
-- ExecuteAsAdmin rm -R $SPOOL_DIR
-- fi
- fi
- fi
- }
diff --git a/gridengine-rpath.patch b/gridengine-rpath.patch
deleted file mode 100644
index 860d4ff..0000000
--- a/gridengine-rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up GE2011.11/source/aimk.rpath GE2011.11/source/aimk
---- GE2011.11/source/aimk.rpath 2012-03-21 09:33:14.000000000 -0600
-+++ GE2011.11/source/aimk 2012-03-21 09:35:10.244582861 -0600
-@@ -1645,10 +1645,8 @@ case LINUX*:
-
- set JAVA_ARCH = "linux"
-
-- # due to -rpath relative_path the LD_LIBRARY_PATH not needed anymore
-- set RUNPATH = -Wl,-rpath,'\$$ORIGIN'/../../lib/$buildarch
-- set LFLAGS = "$LFLAGS $RUNPATH"
-- set SHARED_LFLAGS = "$SHARED_LFLAGS $RUNPATH"
-+ set LFLAGS = "$LFLAGS"
-+ set SHARED_LFLAGS = "$SHARED_LFLAGS"
-
- if ( $COMPILE_ARCH == "ULINUX86" || $COMPILE_ARCH == "ULINUXX64" ) then
- echo "Ignore jemalloc for unsupported architectures!"
diff --git a/gridengine.spec b/gridengine.spec
deleted file mode 100644
index 6e82b85..0000000
--- a/gridengine.spec
+++ /dev/null
@@ -1,973 +0,0 @@
-%global username sgeadmin
-%global homedir %{_datadir}/gridengine
-%global gecos Grid Engine
-%global _hardened_build 1
-
-# gridengine uses a versioned binary protocol to communicate between the master
-# and the nodes that needs to be the same on all machines in a cluster. This
-# version is defined by GRM_GDI_VERSION in: libs/gdi/version.c
-# No updates should be pushed that bump this version in a stable release.
-
-Name: gridengine
-Version: 2011.11p1
-Release: 34%{?dist}
-Summary: Grid Engine - Distributed Computing Management software
-
-Group: Applications/System
-# Only the file %{_libexecdir}/gridengine/bin/*/qmake is
-# under GPLv2+, which is not used or linked by other parts
-# of gridengine.
-# The file %{_libexecdir}/gridengine/bin/*/qtcsh is
-# under BSD with advertising,
-# which is not used or linked by other parts of gridengine.
-License: (BSD and LGPLv2+ and MIT and SISSL) and GPLv2+ and BSD with advertising
-URL: http://gridscheduler.sourceforge.net/
-Source0: http://downloads.sourceforge.net/gridscheduler/GE%{version}/GE%{version}....
-Source1: gridengine-ppc.tar.gz
-Source2: conf_defaults
-Source3: sge.csh
-Source4: sge.sh
-%if 0%{?fedora} || 0%{?rhel} >= 7
-Source5: sge_execd.service
-Source6: sgemaster.service
-Source7: sge_shadowd.service
-%else
-Source5: sge_execd
-Source6: sgemaster
-%endif
-Source8: Licenses
-Source9: gridengine.sysconfig
-Source10: libcore.c
-Source11: README
-Source12: maketarball
-# Make loadsensor reports fresh
-Patch0: gridengine-loadsensor.patch
-# Add LDFLAGS to LFLAGS used by aimk
-Patch1: gridengine-ldflags.patch
-# Fix format-security errors
-# https://bugzilla.redhat.com/show_bug.cgi?id=1037103
-Patch2: gridengine-format.patch
-# Try to support arm architecture
-Patch4: gridengine-arm.patch
-# Don't need to make rc files in inst_common.sh
-# Partially http://gridengine.sunsource.net/issues/show_bug.cgi?id=2780
-Patch10: gridengine-rctemplates.patch
-# Fixup sge_ca to use system openssl and java paths
-Patch11: gridengine-6.2u2_1-sge_ca.patch
-# Fixup jni paths
-Patch12: gridengine-6.2-jni.patch
-# Don't use rpaths
-Patch13: gridengine-rpath.patch
-# Fix issue with hostnames and localhost
-Patch14: gridengine-6.2u5-gethostname.patch
-
-# handle aarch64 properly
-Patch15: gridengine-add-aarch64.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch: ppc64
-
-BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
-BuildRequires: libXmu-devel, libXpm-devel
-BuildRequires: openmotif-devel
-BuildRequires: java-devel >= 1.6.0, javacc, ant-junit
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires: ant-nodeps
-%endif
-BuildRequires: elfutils-libelf-devel, net-tools
-BuildRequires: groff
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: hostname
-%endif
-BuildRequires: hwloc-devel
-BuildRequires: jemalloc-devel
-BuildRequires: perl-generators
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: systemd
-%endif
-Requires: binutils
-Requires: ncurses
-Requires(posttrans): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-Requires(pre): shadow-utils
-
-
-%description
-In a typical network that does not have distributed resource management
-software, workstations and servers are used from 5% to 20% of the time.
-Even technical servers are generally less than fully utilized. This
-means that there are a lot of cycles that can be used productively if
-only users know where they are, can capture them, and put them to work.
-
-Grid Engine finds a pool of idle resources and harnesses it
-productively, so an organization gets as much as five to ten times the
-usable power out of systems on the network. That can increase utilization
-to as much as 98%.
-
-Grid Engine software aggregates available compute resources and
-delivers compute power as a network service.
-
-These are the local files shared by both the qmaster and execd
-daemons. You must install this package in order to use any one of them.
-
-
-%package devel
-Summary: Gridengine development files
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-gridengine development headers and libraries.
-
-
-%package qmon
-Summary: Gridengine qmon monitor
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi
-
-%description qmon
-The qmon graphical grid engine monitor
-
-
-%package execd
-Summary: Gridengine execd program
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 7
-Requires(post): systemd
-Requires(postun): systemd
-Requires(preun): systemd
-%else
-Requires(post): /sbin/chkconfig
-Requires(postun): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-%endif
-Requires(postun): %{name} = %{version}-%{release}
-Requires(preun): %{name} = %{version}-%{release}
-
-%description execd
-Programs needed to run a grid engine execution host
-
-
-%package qmaster
-Summary: Gridengine qmaster programs
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-Requires: db4-utils
-%if 0%{?fedora} || 0%{?rhel} >= 7
-Requires(post): systemd
-Requires(postun): systemd
-Requires(preun): systemd
-%else
-Requires(post): /sbin/chkconfig
-Requires(postun): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-%endif
-Requires(postun): %{name} = %{version}-%{release}
-Requires(preun): %{name} = %{version}-%{release}
-
-%description qmaster
-Programs needed to run a grid engine qmaster or shadowd host
-
-
-%prep
-%setup -q -n GE%{version} -a 1
-#Use system hwloc and jemalloc
-rm -r source/3rdparty/hwloc
-rm -r source/3rdparty/jemalloc
-#Copy Licenses and README file into build directory
-cp %SOURCE8 %SOURCE11 .
-#Remove unneeded shbangs
-sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
-%patch0 -p0 -b .loadsensor
-%patch1 -p1 -b .ldflags
-%patch2 -p1 -b .format
-%patch4 -p1 -b .arm
-%patch10 -p1 -b .rctemplates
-%patch11 -p1 -b .sge_ca
-%patch12 -p1 -b .jni
-%patch13 -p1 -b .rpath
-%patch14 -p1 -b .gethostname
-%patch15 -p1
-sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
-#Don't ship rctemplates
-rm -rf source/dist/util/rctemplates
-#Don't ship windows .bat scripts
-find source -name \*.bat | xargs rm
-#Fix permissions
-chmod +x source/dist/util/dl?.*sh
-chmod -x source/dist/util/dl.*sh
-find source -name \*.c | xargs chmod -x
-#Fix flags for qmake build
-find source/3rdparty/qmake source/3rdparty/qtcsh -name Makefile |
- xargs sed -i -e "/^CFLAGS *=/s:=:= $RPM_OPT_FLAGS:"
-#dlopen the runtime libssl library
-soname=$(objdump -p %{_libdir}/libssl.so | awk '/SONAME/ {print $2}')
-sed -i -e s/libssl\.so/$soname/ source/libs/comm/cl_ssl_framework.c
-#Fix xterm path
-sed -i -e s,X11/xterm,xterm,g doc/htmlman/htmlman5/sge_conf.html \
- doc/man/man5/sge_conf.5 \
- source/dist/util/arch_variables \
- source/libs/sgeobj/sge_conf.c
-
-# from configure macro - update gnu-config files for aarch64
-for i in $(find . -name config.guess -o -name config.sub) ; do
- [ -f /usr/lib/rpm/redhat/$(basename $i) ] && /usr/bin/rm -f $i && /usr/bin/cp -fv /usr/lib/rpm/redhat/$(basename $i) $i ;
-done
-
-%build
-export JAVA_HOME=%{java_home}
-cd source
-#Setup paths
-cat > aimk.private <<EOF
-set OPENSSL_HOME = /usr
-set BERKELEYDB_HOME = /usr
-%if 0%{?fedora} || 0%{?rhel} >= 7
-set BDB_INCLUDE_SUBDIR = libdb4
-set BDB_LIB_SUBDIR = ../%{_lib}/libdb4
-%else
-set BDB_INCLUDE_SUBDIR =
-set BDB_LIB_SUBDIR = ../%{_lib}
-%endif
-set KRB_HOME = /usr
-set MAN2HTMLPATH = /usr/bin
-set GROFFPATH = /usr/bin
-set SWIG = /usr/bin/swig
-set PERL = /usr/bin/perl
-set TCLSH = /usr/bin/tclsh
-set JUNIT_JAR = /usr/share/java/junit.jar
-set CORE_HOME = `pwd`
-EOF
-cat > build_private.properties <<EOF
-javacc.home=%{_javadir}
-default.sge.javac.source=1.5
-default.sge.javac.target=1.5
-libs.junit.classpath=%{_javadir}/junit.jar
-izpack.lib=/usr/share/java/izpack
-hadoop.javac.source=1.6
-hadoop.javac.target=1.6
-hadoop.home=/usr/share/java
-EOF
-
-#Build libcore.so
-gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -c %SOURCE10 -o libcore.o
-gcc $RPM_LD_FLAGS -shared -o libcore.so libcore.o -lpthread
-export SGE_INPUT_CFLAGS="$RPM_OPT_FLAGS -DNeedVarargsPrototypes"
-export LDFLAGS="$RPM_LD_FLAGS"
-touch aimk
-./aimk -only-depend
-scripts/zerodepend
-./aimk -sys-hwloc -sys-jemalloc -sys-libssl depend
-#TODO - Need IzPack for GUI Installer
-./aimk -no-gui-inst -sys-hwloc -sys-jemalloc -sys-libssl
-./aimk -man -sunman
-#Not build by default - going to need hadoop
-#ant herd
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-#Set the gridengine arch
-gearch=`%{_builddir}/%{buildsubdir}/source/dist/util/arch`
-# set up the target installation directory
-export SGE_ROOT=$RPM_BUILD_ROOT%{_datadir}/gridengine
-mkdir -p $SGE_ROOT
-cd source
-echo 'y'| scripts/distinst -nobdb -noopenssl -local -allall -noexit -mansrc sge ${gearch}
-
-#Create default install configuration
-cp dist/util/install_modules/inst_template.conf \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/my_configuration.conf
-cat %SOURCE2 | while read line
-do
- key=${line/=*/}
- value=${line/*=/}
- sed -i -e "/^${key}=/s,=.*,=$value," $RPM_BUILD_ROOT%{_datadir}/gridengine/my_configuration.conf
-done
-
-install -p -m755 `scripts/compilearch -b`/qevent $RPM_BUILD_ROOT%{_datadir}/gridengine/bin
-
-# man - do before the alternatives rename below
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/man/man* $RPM_BUILD_ROOT%{_mandir}
-
-# Move things to the right location, making links back
-# bin
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/bin $RPM_BUILD_ROOT%{_prefix}
-rmdir $RPM_BUILD_ROOT%{_bindir}/${gearch}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}
-# Rename common queuing binaries and manpages for use with alternatives
-for bin in qalter qdel qhold qmake qrls qselect qstat qsub
-do
- if [ -L $RPM_BUILD_ROOT%{_bindir}/$bin ]
- then
- target=`readlink $RPM_BUILD_ROOT%{_bindir}/$bin`
- rm $RPM_BUILD_ROOT%{_bindir}/$bin
- ln -s ${target}-ge $RPM_BUILD_ROOT%{_bindir}/${bin}-ge
- else
- mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-ge
- fi
- mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-ge.1
-done
-for bin in `find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l`
-do
- ln -s ../../../../bin/`basename $bin` \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}/`basename $bin -ge`
-done
-
-# utilbin
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/gridengine/utilbin
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/utilbin/* \
- $RPM_BUILD_ROOT%{_libexecdir}/gridengine/utilbin
-ln -s ../../../libexec/gridengine/utilbin \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/utilbin/${gearch}
-# We also need some db utils
-ln -s ../../../bin/db_dump ../../../bin/db_load \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/utilbin/
-
-# lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/lib $RPM_BUILD_ROOT%{_libdir}
-ln -s ../../%{_lib}/gridengine $RPM_BUILD_ROOT%{_datadir}/gridengine/lib
-# libcore.so
-install -p -m755 libcore.so $RPM_BUILD_ROOT%{_libdir}
-# Move the JNI libraries
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-for jni in jgdi juti
-do
- mv $RPM_BUILD_ROOT%{_libdir}/${jni}.jar $RPM_BUILD_ROOT%{_libdir}/lib${jni}.so \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/
-done
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mv $RPM_BUILD_ROOT%{_libdir}/drmaa.jar $RPM_BUILD_ROOT%{_javadir}/drmaa.jar
-mv $RPM_BUILD_ROOT%{_libdir}/JSV.jar $RPM_BUILD_ROOT%{_javadir}/JSV.jar
-
-# include
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/include $RPM_BUILD_ROOT%{_includedir}
-
-# app-defaults
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/qmon/*.ad \
- $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-
-# The default cell directories
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common
-
-# The default qmaster, spool, and spooldb directories
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/qmaster
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/spool/{admin_hosts,cqueues,job_scripts,resource_quotas,zombies,calendars,exec_hosts,pe,submit_hosts,centry,hostgroups,projects,users,ckpt,jobs,qinstances,usersets}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/spooldb
-
-# These files get created during user setup (install_qmaster)
-for f in common/{act_qmaster,bootstrap,qtask,settings.csh,settings.sh,sge_aliases,sgeexecd,sgemaster,sge_request}
-do
- touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/${f}
-done
-for f in qmaster/job_scripts spooldb/{__db.00{1,2,3,4,5,6},log.0000000001,sge,sge_job}
-do
- touch $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/${f}
-done
-
-# Environment (SGE_ROOT)
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -p -m644 %SOURCE3 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
-# Startup scripts
-%if 0%{?fedora} || 0%{?rhel} >= 7
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -p -m644 %SOURCE5 %SOURCE6 %SOURCE7 $RPM_BUILD_ROOT%{_unitdir}
-%else
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p -m755 %SOURCE5 %SOURCE6 $RPM_BUILD_ROOT%{_initrddir}
-%endif
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -p -m644 %SOURCE9 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridengine
-
-#sgeCA
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/sgeCA
-
-# Don't package catman files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/catman
-
-# Rename some man pages to avoid conflicts
-pushd $RPM_BUILD_ROOT%{_mandir}/man5
-for f in *
-do
- if [ ${f:0:4} != sge_ ]
- then
- mv $f sge_$f
- fi
-done
-popd
-
-#Don't need these
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/3rd_party
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/dtrace
-
-#Don't ship example binaries
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/examples/jobsbin
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/examples/worker.*
-
-#Cleanup some patch backups that get shipped
-rm $RPM_BUILD_ROOT%{_datadir}/gridengine/util/install_modules/inst_*.sh.*
-
-#TODO - Ship the GUI installer
-rm $RPM_BUILD_ROOT%{_datadir}/gridengine/start_gui_installer
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%pre
-getent group %{username} >/dev/null || groupadd -r %{username}
-getent passwd %{username} >/dev/null || \
- useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
- -c '%{gecos}' %{username}
-exit 0
-
-
-%post -p /sbin/ldconfig
-
-%posttrans
-alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-ge 10 \
- --slave %{_mandir}/man1/qsub.1.gz qsub-man \
- %{_mandir}/man1/qsub-ge.1.gz \
- --slave %{_bindir}/qalter qalter %{_bindir}/qalter-ge \
- --slave %{_mandir}/man1/qalter.1.gz qalter-man \
- %{_mandir}/man1/qalter-ge.1.gz \
- --slave %{_bindir}/qdel qdel %{_bindir}/qdel-ge \
- --slave %{_mandir}/man1/qdel.1.gz qdel-man \
- %{_mandir}/man1/qdel-ge.1.gz \
- --slave %{_bindir}/qhold qhold %{_bindir}/qhold-ge \
- --slave %{_mandir}/man1/qhold.1.gz qhold-man \
- %{_mandir}/man1/qhold-ge.1.gz \
- --slave %{_bindir}/qrls qrls %{_bindir}/qrls-ge \
- --slave %{_mandir}/man1/qrls.1.gz qrls-man \
- %{_mandir}/man1/qrls-ge.1.gz \
- --slave %{_bindir}/qselect qselect %{_bindir}/qselect-ge \
- --slave %{_mandir}/man1/qselect.1.gz qselect-man \
- %{_mandir}/man1/qselect-ge.1.gz \
- --slave %{_bindir}/qstat qstat %{_bindir}/qstat-ge \
- --slave %{_mandir}/man1/qstat.1.gz qstat-man \
- %{_mandir}/man1/qstat-ge.1.gz || :
-
-%preun
-if [ $1 -eq 0 ] ; then
- alternatives --remove qsub %{_bindir}/qsub-ge || :
-fi
-
-%postun -p /sbin/ldconfig
-
-
-%post execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_post sge_execd.service
-%else
-/sbin/chkconfig --add sge_execd
-%endif
-
-
-%postun execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_postun_with_restart sge_execd.service
-%else
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /sbin/service sge_execd condrestart >/dev/null 2>&1 || :
-fi
-%endif
-
-%preun execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_preun sge_execd.service
-%else
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /sbin/service sge_execd stop
- /sbin/chkconfig --del sge_execd
-fi
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerun -- gridengine-execd < 6.2u5p2-2
-/usr/bin/systemd-sysv-convert --save sge_execd >/dev/null 2>&1 || :
-/sbin/chkconfig --del sge_execd >/dev/null 2>&1 || :
-/bin/systemctl try-restart sge_execd.service >/dev/null 2>&1 || :
-%endif
-
-%post qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_post sgemaster.service
-%systemd_post sge_shadowd.service
-%else
-/sbin/chkconfig --add sgemaster
-%endif
-
-%postun qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_postun_with_restart sgemaster.service
-%systemd_postun_with_restart sge_shadowd.service
-%else
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /sbin/service sgemaster condrestart >/dev/null 2>&1 || :
-fi
-%endif
-
-%preun qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_preun sgemaster.service
-%systemd_preun sge_shadowd.service
-%else
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /sbin/service sgemaster stop
- /sbin/chkconfig --del sgemaster
-fi
-%endif
-
-
-%files
-%doc Licenses README
-%config(noreplace) %{_sysconfdir}/profile.d/sge.*
-%config(noreplace) %{_sysconfdir}/sysconfig/gridengine
-# Only the file %{_bindir}/qmake-ge is
-# under GPLv2+
-# Olny the file %{_bindir}/qtcsh is
-# under BSD with advertising
-%{_bindir}/*
-%exclude %{_bindir}/qacct
-%exclude %{_bindir}/qmon
-%exclude %{_bindir}/sge_execd
-%exclude %{_bindir}/sge_qmaster
-%exclude %{_bindir}/sge_shadowd
-%exclude %{_bindir}/sge_*shepherd
-%{_libdir}/%{name}
-%{_libdir}/libcore.so
-%{_libdir}/libdrmaa.so*
-%{_libdir}/libspoolb.so
-%{_libdir}/libspoolc.so
-%{_javadir}/drmaa.jar
-%{_javadir}/JSV.jar
-%{_libexecdir}/gridengine/
-%attr(-,%username,%username) %dir %{_datadir}/gridengine
-%{_datadir}/gridengine/bin
-%exclude %{_datadir}/gridengine/bin/*/qacct
-%exclude %{_datadir}/gridengine/bin/*/qmon
-%exclude %{_datadir}/gridengine/bin/*/sge_execd
-%exclude %{_datadir}/gridengine/bin/*/sge_qmaster
-%exclude %{_datadir}/gridengine/bin/*/sge_shadowd
-%exclude %{_datadir}/gridengine/bin/*/sge_*shepherd
-%{_datadir}/gridengine/ckpt
-%attr(-,%username,%username) %ghost %{_datadir}/gridengine/default
-%{_datadir}/gridengine/doc
-%{_datadir}/gridengine/hadoop
-%{_datadir}/gridengine/inst_sge
-%{_datadir}/gridengine/lib
-%{_datadir}/gridengine/mpi
-%{_datadir}/gridengine/my_configuration.conf
-%dir %{_datadir}/gridengine/pvm
-%{_datadir}/gridengine/pvm/*
-%exclude %{_datadir}/gridengine/pvm/src
-%{_datadir}/gridengine/util
-%dir %{_datadir}/gridengine/utilbin
-%{_datadir}/gridengine/utilbin/*
-%exclude %{_datadir}/gridengine/utilbin/db_*
-%{_mandir}/man1/*.1*
-%exclude %{_mandir}/man1/qmon.1*
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
-%exclude %{_mandir}/man8/sge_qmaster.8*
-%exclude %{_mandir}/man8/sge_shadowd.8*
-%exclude %{_mandir}/man8/sge_execd.8*
-%exclude %{_mandir}/man8/sge_*shepherd.8*
-%attr(-,%username,%username) %dir %{_localstatedir}/spool/gridengine
-%attr(-,%username,%username) %dir %{_localstatedir}/spool/gridengine/default
-
-%files devel
-%{_includedir}/*
-%{_datadir}/gridengine/examples
-%{_datadir}/gridengine/pvm/src
-%{_mandir}/man3/*.3*
-
-%files qmon
-%{_bindir}/qmon
-%{_libdir}/libXltree.so
-%{_datadir}/X11/app-defaults/*
-%{_datadir}/gridengine/bin/*/qmon
-%{_datadir}/gridengine/qmon/
-%{_mandir}/man1/qmon.1*
-
-%files execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%{_unitdir}/sge_execd.service
-%else
-%{_initrddir}/sge_execd
-%endif
-%{_bindir}/sge_execd
-%{_bindir}/sge_*shepherd
-%{_datadir}/gridengine/install_execd
-%{_datadir}/gridengine/bin/*/sge_execd
-%{_datadir}/gridengine/bin/*/sge_*shepherd
-%{_mandir}/man8/sge_execd.8*
-%{_mandir}/man8/sge_*shepherd.8*
-
-%files qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%{_unitdir}/sgemaster.service
-%{_unitdir}/sge_shadowd.service
-%else
-%{_initrddir}/sgemaster
-%endif
-%{_bindir}/qacct
-%{_bindir}/sge_qmaster
-%{_bindir}/sge_shadowd
-%{_datadir}/gridengine/bin/*/qacct
-%{_datadir}/gridengine/bin/*/sge_qmaster
-%{_datadir}/gridengine/bin/*/sge_shadowd
-%{_datadir}/gridengine/install_qmaster
-%{_datadir}/gridengine/utilbin/db_*
-%{_mandir}/man8/sge_qmaster.8*
-%{_mandir}/man8/sge_shadowd.8*
-%attr(-,%username,%username) %dir %{_localstatedir}/sgeCA
-%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/qmaster
-%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spool
-%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spooldb
-
-
-%changelog
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 12 2016 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-31
-- Set locked memory limit to unlimited for sge_execd for InfiniBand use
-- Minor cleanup
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Oct 14 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 2011.11p1-29
-- Fix build on AArch64
-
-* Tue Oct 6 2015 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-28
-- Build against openmotif
-
-* Sun Aug 30 2015 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-27
-- Rebuild for jemalloc 4.0.0
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Apr 10 2015 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-25
-- Keep network.target in service files for non-NM network config
-
-* Tue Oct 28 2014 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-24
-- Unit files are not executable
-
-* Fri Oct 3 2014 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-23
-- Update format patch to fix more -Werror=format-security errors (bug #1037103)
-
-* Thu Sep 4 2014 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-22
-- Add PIDFile to sgemaster.service (bug #1082129)
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Aug 7 2014 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-20
-- Fix build with -Werror=format-security (bug #1037103)
-
-* Mon Jul 14 2014 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-19
-- Use After=network-online.target for service files
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Oct 3 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-17
-- Upload updated tarball without .svn dirs
-- Drop non-functional url for libcore.c
-
-* Sat Aug 03 2013 Petr Pisar <ppisar(a)redhat.com> - 2011.11p1-16
-- Perl 5.18 rebuild
-
-* Tue Jul 30 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-15
-- Ship libdrmaa.so in main package, needed for Java runtime (bug #671880)
-
-* Thu Jul 18 2013 Petr Pisar <ppisar(a)redhat.com> - 2011.11p1-14
-- Perl 5.18 rebuild
-
-* Tue May 21 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-13
-- Add sge_shadowd.service and move shadowd to qmaster package (bug #955768)
-
-* Tue May 21 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-12
-- Add patch to add LDFLAGS to LFLAGS so _hardened_build actually works (bug #965479)
-
-* Wed May 1 2013 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-11
-- Fix user/group creation to use dynamic id allocation
-
-* Wed Apr 24 2013 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-10
-- Use updated systemd scriptlets (bug #850136)
-
-* Mon Apr 22 2013 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-9
-- Only BR ant-nodeps on RHEL
-
-* Wed Apr 10 2013 Jon Ciesla <limburgher(a)gmail.com> - 2011.11p1-8
-- Migrate from fedora-usermgmt to guideline scriptlets.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Oct 16 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-6
-- Build java with source/target 1.5 to properly compile generics (bug 842595)
-
-* Wed Oct 3 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-5
-- Add patch to generate load sensor reports just before sending them
-- Only BR hostname on Fedora
-- Fix Fedora conditional for db4 support
-
-* Fri Aug 3 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-4
-- Support libdb4 in Fedora 18+
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jul 9 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-2
-- Do not remove spool directory in execd uninstall script (bug 836102)
-
-* Mon Jul 9 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-1
-- Update to 2011.11p1
-- Drop env-code-injection, buffer-overflow, and symlink patches
-- Rebase rctemplates patch
-
-* Fri Jul 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-4.svn131
-- Add patch to set JAVA_LIB_ARCH on arm (bug 837137)
-- Add BR hostname
-
-* Tue Apr 17 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-3.svn131
-- Set _hardened_build
-- Add two more upstream security patches
-- Renumber patches
-
-* Tue Apr 17 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-2.svn131
-- Update to svn 131
-- Add upstream env-code-injection security patch
-
-* Wed Mar 21 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-1.svn115
-- Update to svn 115
-- Add back SysV init script handling for EL builds
-- Drop inst, db, lesstif, libs, error, openssl, qtcsh patches fixed upstream
-- Build with -sys-libssl
-- Use sge_/SGE_ names in man pages
-
-* Wed Mar 14 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-1.svn93
-- Update to gridscheduler 2011.11 plus svn revision 93
-- Rebase ssl, rctemplates, and rpath patches
-- Drop Werror, quotes, ant, auto, jemalloc, paths, and add-missing
- patches fixed upstream
-- Add qtcsh patch to avoid using -R when linking
-- Add BR on hwloc-devel
-- Make systemd conditional on Fedora >= 15
-- Use -sys-hwloc and -sys-jemalloc aimk flags
-- Remove qacct and sge_qmaster from BINFILES checks (Bug 803502)
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u5p2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Oct 14 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-6
-- Update linux 3 patch to fix installed arch script as well
-
-* Thu Sep 8 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-5
-- Add patch to properly quote m4 macros
-- Add patch to hack linux 3 support - keeps arch as lx26-*
-- Add patch to run automake with --add-missing to fix qmake build
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-4
-- Add SysV to systemd migration triggers
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-3
-- Add BR groff
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-2
-- Migrate to systemd unit files
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-1
-- Update to opengridscheduler release 6.2u5p2
-- Drop patches applied upstream
-
-* Fri Jul 29 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-10
-- Move sge_*shepherd to execd sub-package
-
-* Thu Jun 23 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-9
-- Use system jemalloc library, fixes FTBFS bug 715676
-- Cleanup some '//' in include paths triggering debugedit failures
-
-* Fri May 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-8
-- Add patches from opengridscheduler to fix vmem reporting and
- slotwise preemption
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Dec 6 2010 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-6
-- Add Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi
- to qmon package (bug 657406)
-- Add patch to fix issue with hostnames (bug 654943)
-
-* Wed Aug 25 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-5
-- Update instructions to referece ./my_configuration.conf (bug #557628)
-- Don't set IFS when reading conf file, breaks lots of stuff
-- Set SGE_JVM_LIB_PATH to none by default so we don't setup JMF
-
-* Wed Aug 11 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-4
-- Use upstream my_configuration.conf as template for default one (bugs 557628,566294)
-- Set SGE_CELL in sge.sh/sge.csh (bug 620907)
-
-* Mon Jul 12 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-3
-- Exclude ppc64 - no java 1.6.0
-
-* Tue Feb 16 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-2
-- Update ssl patch to add -lcrypt to fix FTBFS bug #565003
-
-* Mon Dec 28 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-1
-- Update to 6.2u5
-
-* Thu Oct 29 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u4-1
-- Update to 6.2u4
-- Drop import patch fixed upstream
-- Updated rctemplates and auto patches
-- Add patch to call ant with appropriate library directory
-
-* Tue Aug 25 2009 Tomas Mraz <tmraz(a)redhat.com> - 6.2u3-3
-- rebuilt with new openssl
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 17 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u3-1
-- Update to 6.2u3
-- Drop ppc patch fixed upstream
-- Update rctemplates patch
-
-* Mon Apr 6 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u2_1-1
-- Update to 6.2u2_1
-- Rebase several patches
-- Add patch to rename getline()
-- Add patch to compile with correct libs on ppc/ppc64
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Feb 19 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u1-3
-- Add patch to import specific classes to avoid pulling in other ones
-
-* Thu Jan 15 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u1-2
-- Rebuild with openssl-0.9.8j
-
-* Thu Dec 18 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u1-1
-- Update to 6.2u1
-
-* Mon Nov 17 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-5
-- Leave qmake-ge in %{_bindir}
-- Use system db_* utils in bdb_checkpoint script
-- Fix xterm path in default setup
-- Change java BR to >= 1.6.0 to allow building with other 1.6 javas
-
-* Tue Nov 11 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-4
-- Add note to README about localhost line in /etc/hosts
-- Cleanup setting.sh some, no more MAN stuff
-- Add conditional build support for EL
-
-* Wed Nov 5 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-3
-- Add Requires: ncurses for "clear"
-- Add patch from CVS to update install scripts
-- Patch sge_ca script not to use system openssl
-- Modify code to dlopen runtime ssl library
-- Patch install_qmaster to update /etc/sysconfig/gridengine
-- Point install scripts to proper JAVA_HOME
-- Have sgemaster init script use /etc/sysconfig/gridengine
-- Add patch to point to jni library locations
-- Make sure install_qmaster sets up default managers/operators
-
-* Fri Sep 26 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-2
-- No more sge_schedd in 6.2, remove from startup script
-
-* Mon Aug 11 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-1
-- Update to 6.2 final
-
-* Tue Jul 15 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2beta2-0.1
-- Provide some installation instructions for these RPMs
-- Fix up some installation script issues
-- Ghost more directories created later
-
-* Thu Jun 5 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2beta-0
-- Update to 6.2beta
-- Use aimk.private and build_private.properties instead of patching
- aimk and build.properties
-- Cleanup some extra /s in paths
-- Shift to Java 1.6.0 because of new requirements in the source
-- Move Java JNI libraries to proper location
-- Drop several upstreamed patches
-- Add patch to avoid linking unneeded libraries
-
-* Fri Apr 11 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u4-1
-- Update to 6.1u4
-
-* Tue Apr 1 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-7
-- Use alternatives to avoid conflicts with torque (bug #437613)
-- Add patch to support stricter csh variable handling
-
-* Fri Feb 8 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-6
-- Fixup subpackage License tags
-- Service name change in scriptlets
-
-* Thu Feb 7 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-5
-- Rewrite initscripts
-- Remove spurious Requires(post): /sbin/ldconfig
-- Add License explanation file and fix License tags
-
-* Mon Feb 4 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-4
-- Drop arch from source
-- Fix Requires() for main package
-- Move man3 to -devel
-
-* Fri Feb 1 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-3
-- Fix various review comments and rpmlint issues (bug #316141)
-
-* Thu Jan 31 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-2
-- Actually ship sge_execd in the execd subpackage
-- Don't complain about missing sge_execd during inst_sge -upd
-- Link in db_dump and db_load into utilbin so that update scripts can find them
-
-* Wed Jan 9 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-1
-- Update to 6.1u3
-- Split execd into sub-package
-
-* Thu Nov 15 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-5
-- Add BR net-tools for hostname for java build on devel
-
-* Mon Nov 12 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-4
-- Add patch and source for ppc/ppc64 builds
-
-* Fri Nov 2 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-3
-- Add patch to fix qstat xml output
-
-* Thu Oct 18 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-2
-- Cleanup arch handling
-- Install qevent
-
-* Tue Oct 2 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-1
-- Fedora packaging
diff --git a/gridengine.sysconfig b/gridengine.sysconfig
deleted file mode 100644
index ae0d43e..0000000
--- a/gridengine.sysconfig
+++ /dev/null
@@ -1,50 +0,0 @@
-SGE_ROOT=/usr/share/gridengine
-# If running under a different cell and using systemd, you will also need to
-# copy # /uer/lib/systemd/system/sgemaster.service to /etc/systemd/system/sgemaster.service
-# and change the cell name there.
-SGE_CELL=default
-#Uncomment this if using infiniband to remove the locked memory limit
-#RTLIMIT_MEMLOCKED=unlimited
-
-#-- shadow master daemon control variables
-# These variables interact in the following way.
-# - The master host updates the heartbeat file every 30 seconds.
-# - The sge_shadowd daemon checks for changes to heartbeat file every
-# number of seconds defined by the SGE_CHECK_INTERVAL variable. So,
-# this value must be greater than 30 seconds.
-# - If the sge_shadowd daemon notices that the heartbeat file has been
-# updated, it starts waiting again until it is once more time to check
-# the heartbeat file.
-# - If the sge_shadowd daemon notices that the heartbeat file has not
-# been updated, it waits for number of seconds defined by the
-# SGE_CHECK_INTERVAL variable to expire. This step lets you make sure
-# that the sge_shadowd daemon is not too aggressive in trying to
-# takeover and allows the master host some leeway in updating the
-# heartbeat file.
-# - When the SGE_GET_ACTIVE_INTERVAL has expired, sge_shadowd daemon
-# takes over if heartbeat file is still not updated.
-# - A reasonable configuration might be to set the SGE_CHECK_INTERVAL
-# to be 45 seconds and the SGE_GET_ACTIVE_INTERVAL to be 90 seconds.
-# So, after about 2 minutes, the take over will occur. If you want to
-# check the operation of the shadow host after you have configured
-# these environment variables you will have to pull out the master
-# host's network cable or kill -9 the master daemon process to simulate
-# a failure because a clean shutdown creates a lock file in
-# $SGE_ROOT/$SGE_CELL/qmaster/lock that prevents shadow daemons taking
-# over. This can be avoided by deleting the lock file on shudown, e.g
-# by adding the following line to the sgemaster.service systemd unitfile
-# ExecStopPost=/bin/su - sgeadmin -c 'rm -f $SGE_ROOT/$SGE_CELL/qmaster/lock'
-
-# This variable controls the interval in which sge_shadowd pauses if a
-# takeover bid fails. This value is used only when there are multiple
-# sge_shadowd instances and they are contending to be the master.
-# (the default is 600 seconds.)
-#SGE_DELAY_TIME=600
-
-# This variable controls the interval in which the sge_shadowd checks
-# the heartbeat file (60 seconds by default.)
-#SGE_CHECK_INTERVAL=60
-
-# This variable controls the interval when a sge_shadowd instance tries
-# to take over when the heartbeat file has not changed.
-#SGE_GET_ACTIVE_INTERVAL=120
diff --git a/libcore.c b/libcore.c
deleted file mode 100644
index 912d2d6..0000000
--- a/libcore.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Place holder library to ensure prctl(PR_SET_DUMPABLE, 1) is done after
- * each setuid(), seteuid(), setgid(), and setegid()
- */
-#include <sys/types.h>
-#include <dlfcn.h>
-#include <pthread.h>
-#include <sys/prctl.h>
-
-static pthread_once_t only_once = PTHREAD_ONCE_INIT;
-
-static int (*setuid_func)(uid_t uid) = NULL;
-static int (*seteuid_func)(uid_t uid) = NULL;
-static int (*setgid_func)(gid_t gid) = NULL;
-static int (*setegid_func)(gid_t gid) = NULL;
-
-static void init_funcs(void)
-{
- setuid_func = (int (*)(uid_t uid))dlsym(RTLD_NEXT, "setuid");
- seteuid_func = (int (*)(uid_t uid))dlsym(RTLD_NEXT, "seteuid");
- setgid_func = (int (*)(gid_t uid))dlsym(RTLD_NEXT, "setgid");
- setegid_func = (int (*)(gid_t uid))dlsym(RTLD_NEXT, "setegid");
-}
-
-#define WRAP(func, clib_func, t) \
-int func(t uid) \
-{ \
- pthread_once(&only_once, init_funcs); \
- int ret = clib_func(uid); \
- prctl(PR_SET_DUMPABLE, 1, 42, 42, 42); \
- return ret; \
-}
-
-WRAP(setuid, setuid_func, uid_t)
-WRAP(seteuid, seteuid_func, uid_t)
-WRAP(setgid, setgid_func, gid_t)
-WRAP(setegid, setegid_func, gid_t)
diff --git a/maketarball b/maketarball
deleted file mode 100755
index ee1b0dd..0000000
--- a/maketarball
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-if [ -z "$1" ]
-then
- echo "Usage: $0 TAG"
- exit 1
-else
- tag=$1
-fi
-
-rm -rf gridengine
-cvs -d :pserver:guest@cvs.sunsource.net:/cvs -z3 export -r $tag gridengine
-rm -rf gridengine/{gep,review,www}
-tar cjf ge-${tag}-src.tar.bz2 gridengine
diff --git a/sge.csh b/sge.csh
deleted file mode 100644
index d49aa9c..0000000
--- a/sge.csh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Make sure SGE_ROOT is set
-if ( $?SGE_ROOT ) then
- exit
-endif
-
-if ( -f /etc/sysconfig/gridengine ) then
- setenv SGE_ROOT `grep "^SGE_ROOT=" /etc/sysconfig/gridengine | cut -d"=" -f2`
- setenv SGE_CELL `grep "^SGE_CELL=" /etc/sysconfig/gridengine | cut -d"=" -f2`
-endif
diff --git a/sge.sh b/sge.sh
deleted file mode 100644
index 6752de8..0000000
--- a/sge.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ -z "$SGE_ROOT" ] ; then
- if [ -f /etc/sysconfig/gridengine ] ; then
- . /etc/sysconfig/gridengine
- export SGE_ROOT
- export SGE_CELL
- fi
-fi
diff --git a/sge_execd b/sge_execd
deleted file mode 100644
index c1bdbd9..0000000
--- a/sge_execd
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/sh
-#
-# sge_execd Gridengine execution daemon
-#
-# chkconfig: - 99 01
-# description: The Gridexecution daemon starts and manages grid jobs
-
-### BEGIN INIT INFO
-# Provides: sge_execd
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $network $local_fs $remote_fs
-# Should-Start:
-# Should-Stop:
-# Default-Start:
-# Default-Stop: 0 1 6
-# Short-Description: Gridengine execution daemon
-# Description: The Gridexecution daemon starts and manages grid jobs
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-exec="/usr/bin/sge_execd"
-prog="sge_execd"
-
-#Defaults
-SGE_ROOT=/usr/share/gridengine
-SGE_CELL=default
-
-#Configuration
-config=/etc/sysconfig/gridengine
-[ -e $config ] && . $config
-
-#Export these
-export SGE_ROOT SGE_CELL
-
-utilbin_dir=/usr/libexec/gridengine/utilbin
-# UQHOST is the local host name (unqualified name)
-UQHOST=`$utilbin_dir/gethostname -name | cut -f1 -d.`
-execd_spool_dir=`/usr/bin/qconf -sconf $UQHOST 2>&- | awk '$1 == "execd_spool_dir" { print $2 }'`
-if [ -z "$execd_spool_dir" ]; then
- execd_spool_dir=`/usr/bin/qconf -sconf | awk '$1 == "execd_spool_dir" { print $2 }'`
-fi
-#Add the hostname to the spool directory
-execd_spool_dir=${execd_spool_dir}/${UQHOST}
-pidfile=${execd_spool_dir}/execd.pid
-
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
- [ -x $exec ] || exit 5
- #Set maximum locked memory, needed for infiniband support
- [ -n "$RLIMIT_MEMLOCKED" ] && ulimit -l $RLIMIT_MEMLOCKED
- echo -n $"Starting $prog: "
- daemon --check $prog --pidfile=$pidfile $exec
- retval=$?
- echo
- [ $retval -eq 0 ] && touch $lockfile
- return $retval
-}
-
-stop() {
- echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- if [ "$1" != "soft" ]; then
- for jobid in `ls $execd_spool_dir/active_jobs`; do
- echo " Shutting down Grid Engine shepherd of job $jobid"
- killproc -p $execd_spool_dir/active_jobs/$jobid/pid sge_shepherd
- done
- fi
- return $retval
-}
-
-restart() {
- stop soft
- start
-}
-
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- # run checks to determine if the service is running or use generic status
- status $prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
- start)
- rh_status_q && exit 0
- $1
- ;;
- stop)
- rh_status_q || exit 0
- $1
- ;;
- softstop)
- rh_status_q || exit 0
- stop soft
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- *)
- echo $"Usage: $0 {start|stop|softstop|status|restart|try-restart|reload|force-reload}"
- exit 2
-esac
-exit $?
diff --git a/sge_execd.service b/sge_execd.service
deleted file mode 100644
index ef922fa..0000000
--- a/sge_execd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Gridengine execution daemon
-After=network.target network-online.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/gridengine
-# For InfiniBand
-LimitMEMLOCK=infinity
-ExecStart=/usr/bin/sge_execd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sge_shadowd.service b/sge_shadowd.service
deleted file mode 100644
index 6c87ae2..0000000
--- a/sge_shadowd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Gridengine shadow master daemon
-After=network.target network-online.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/gridengine
-ExecStart=/usr/bin/sge_shadowd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sgemaster b/sgemaster
deleted file mode 100644
index 7e615dc..0000000
--- a/sgemaster
+++ /dev/null
@@ -1,389 +0,0 @@
-#!/bin/sh
-#
-# sgemaster Gridengine master daemon and scheduler
-#
-# chkconfig: - 98 02
-# description: The gridengine master daemon and scheduler
-
-### BEGIN INIT INFO
-# Provides: sge_qmaster
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $network $local_fs $remote_fs
-# Should-Start:
-# Should-Stop:
-# Default-Start:
-# Default-Stop: 0 1 6
-# Short-Description: Gridengine master daemon and scheduler
-# Description: The gridengine master daemon and scheduler
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-master_exec="/usr/bin/sge_qmaster"
-master_prog="sge_qmaster"
-
-#Defaults
-SGE_ROOT=/usr/share/gridengine; export SGE_ROOT
-SGE_CELL=default; export SGE_CELL
-
-#Configuration
-config=/etc/sysconfig/gridengine
-[ -e $config ] && . $config
-
-qmaster_spool_dir=`awk '$1 == "qmaster_spool_dir" { print $2 }' $SGE_ROOT/$SGE_CELL/common/bootstrap`
-master_pidfile=$qmaster_spool_dir/qmaster.pid
-retval=0
-
-
-#---------------------------------------------------------------------------
-# CheckIfQmasterHost
-# If our hostname given in $1 is the same as in the "act_qmaster" file
-# echo "true" else echo "false"
-#
-CheckIfQmasterHost()
-{
- host=$1
-
- if [ "$host" = "`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`" ]; then
- echo true
- else
- echo false
- fi
-}
-
-#---------------------------------------------------------------------------
-# CheckIfPrimaryQmasterHost
-# Check if our hostname given in $1 is the same as in the
-# "primary_qmaster" file
-# echo true if there is our hostname else echo false
-#
-CheckIfPrimaryQmasterHost()
-{
- host=$1
-
- fname=$SGE_ROOT/$SGE_CELL/common/primary_qmaster
-
- if [ -f $fname ]; then
- if [ "$host" = "`cat $fname`" ]; then
- echo true
- else
- echo false
- fi
- else
- echo false
- fi
-}
-
-
-#---------------------------------------------------------------------------
-# CheckIfShadowMasterHost
-# Check if our hostname given in $1 is contained in the
-# "shadow_masters" file
-# set shadow_host true if there is our hostname
-#
-CheckIfShadowMasterHost()
-{
- host=$1
-
- fname=$SGE_ROOT/$SGE_CELL/common/shadow_masters
-
- if [ -f $fname ]; then
- grep -i $host $fname 2>&1 > /dev/null
- if [ $? = 0 ]; then
- shadow_host="true"
- else
- shadow_host="false"
- fi
- else
- shadow_host="false"
- fi
-}
-
-#---------------------------------------------------------------------------
-# GetAdminUser
-# echo the name of the admin user on this system
-# echo "root" if admin user retrieval fails
-GetAdminUser()
-{
- cfgname=$SGE_ROOT/$SGE_CELL/common/bootstrap
- user=none
-
- if [ -f $cfgname ]; then
- user=`grep admin_user $cfgname | awk '{ print $2 }'`
- fi
-
- if [ `echo $user|tr "A-Z" "a-z"` = "none" ]; then
- user=root
- fi
- echo $user
-}
-
-#---------------------------------------------------------------------------
-# CheckRunningQmaster
-# checks, if sge_qmaster is running
-# In error case the sge_qmaster didn't start, silently
-#
-CheckRunningQmaster()
-{
- masterhost=`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`
- running=false
- loop=0
-
- if [ "$SGE_QMASTER_PORT" = "" ]; then
- SGE_QMASTER_PORT=`$utilbin_dir/getservbyname -number sge_qmaster`
- fi
-
- while [ $running = "false" -a $loop -ne 30 ]; do
- qping -info $masterhost $SGE_QMASTER_PORT qmaster 1 > /dev/null 2>&1
-
- if [ "$?" = 0 ]; then
- running=true
- else
- sleep 2
- masterhost=`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`
- loop=`expr $loop + 1`
- fi
- done
-
- if [ $running = "false" ]; then
- echo
- echo "sge_qmaster didn't start!"
- echo "Please check the messages file"
- echo
- fi
-}
-
-#---------------------------------------------------------------------------
-usage()
-{
- echo "Grid Engine start/stop script. Valid parameters are:"
- echo ""
- echo " \"start\" start qmaster daemon"
- echo " \"stop\" shutdown qmaster daemon"
- echo " \"-qmaster\" only start/stop qmaster (if applicable)"
- echo " \"-shadowd\" only start/stop shadowd (if applicable)"
- echo " \"-migrate\" shutdown qmaster if it's running on another"
- echo " host and restart it on this host"
- echo " Migration only works if this host is an admin host"
- echo ""
- echo "Only one of the parameters \"start\", \"stop\" is allowed."
- echo "Only one of the parameters beginning with \"-\" is allowed."
- echo
- echo "Default for \"stop\" is shutting down all components."
- echo
- exit 1
-}
-
-CheckArgs() {
- if [ "$1" = -qmaster ]; then
- qmaster=true
- shadowd=false
- elif [ "$1" = -shadowd ]; then
- qmaster=false
- shadowd=true
- elif [ "$1" = -migrate ]; then
- migrate_qmaster=true
- qmaster=true
- shadowd=false
- else
- usage
- fi
-}
-
-utilbin_dir=/usr/libexec/gridengine/utilbin
-if [ "$utilbin_dir" = "none" ]; then
- echo "can't determine path to Grid Engine utility binaries"
- exit 6
-fi
-
-HOST=`$utilbin_dir/gethostname -aname`
-UQHOST=`$utilbin_dir/gethostname -aname | cut -f1 -d.`
-CheckIfShadowMasterHost $HOST
-
-
-lockfile=/var/lock/subsys/sgemaster
-
-#Default actions
-qmaster=true
-shadowd=true
-qstd=false
-migrate_qmaster=false
-
-start() {
- # qmaster_host=true if qmaster was running on this host the last time
- # this host is an execution host
-
- qmaster_host=`CheckIfQmasterHost $HOST`
- primary_qmaster_host=`CheckIfPrimaryQmasterHost $HOST`
-
- if [ $qmaster = true -a $qmaster_host = true -a $migrate_qmaster = true ]; then
- echo " qmaster and scheduler running on this host. Will not migrate qmaster."
- exit 1
- fi
-
- [ -x $master_exec ] || exit 5
-
- if [ $qmaster = true -a $qmaster_host = false -a \
- \( $primary_qmaster_host = true -o $migrate_qmaster = true \) ]; then
- actual_qmaster_host=`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`
- echo " shutting down qmaster and scheduler on host \"$actual_qmaster_host\" ..."
- qconf_output=`qconf -ks 2>&1 | grep "denied"`
- if [ "$qconf_output" != "" ]; then
- echo " denied: host \"$HOST\" is no admin host."
- exit 1
- fi
- qconf -km > /dev/null 2>&1
-
- qping_count=0
- qping_retries=10
- qping_exit_state=0
- while [ $qping_count -lt $qping_retries ]; do
- qping -info $actual_qmaster_host $SGE_QMASTER_PORT qmaster 1 > /dev/null 2>&1
- qping_exit_state=$?
- if [ $qping_exit_state -ne 0 ]; then
- break
- fi
- sleep 3
- qping_count=`expr $qping_count + 1`
- done
-
- if [ $qping_exit_state -eq 0 ]; then
- # qmaster is still running
- echo " qmaster on host $actual_qmaster_host still alive. Cannot migrate qmaster."
- exit 1
- fi
-
- lock_file_read_retries=10
- lock_file_read_count=0
- lock_file_found=0
- while [ $lock_file_read_count -lt $lock_file_read_retries ]; do
- if [ -f $qmaster_spool_dir/lock ]; then
- lock_file_found=1
- break
- fi
- sleep 3
- lock_file_read_count=`expr $lock_file_read_count + 1`
- done
-
- if [ $lock_file_found -eq 0 ]; then
- # old qmaster did not write lock file
- echo " old qmaster did not write lock file. Cannot migrate qmaster."
- echo " Please verify that qmaster on host $actual_qmaster_host is down"
- echo " and make sure that the lock file in qmaster spool directory is"
- echo " read-able."
- exit 1
- fi
-
- qmaster_host=true
- fi
-
- if [ $qmaster = true -a $qmaster_host = true ]; then
- echo -n $"Starting $master_prog: "
- daemon --check $master_prog --pidfile=$master_pidfile $master_exec
- retval=$?
- CheckRunningQmaster
- elif [ $qmaster = true -a $qmaster_host = false ]; then
- echo
- echo "sge_qmaster didn't start!"
- echo "This is not a qmaster host!"
- echo "Please, check your act_qmaster file!"
- echo
- fi
-
- if [ $shadowd = true -a $shadow_host = true ]; then
- pidfile=$qmaster_spool_dir/shadowd_$HOST.pid
- [ -f $pidfile ] || pidfile=$qmaster_spool_dir/shadowd_$UQHOST.pid
-
- echo -n $"Starting sge_shadowd: "
- daemon --check sge_shadowd --pidfile=$pidfile /usr/bin/sge_shadowd
- retval=$?
- fi
-
- echo
- [ $retval -eq 0 ] && touch $lockfile
- return $retval
-}
-
-stop() {
- if [ $shadow_host = true ]; then
- prog=sge_shadowd
- pidfile=$qmaster_spool_dir/shadowd_$UQHOST.pid
- [ -f $pidfile ] || pidfile=$qmaster_spool_dir/shadowd_$HOST.pid
-
- # Send SIGTERM to shadowd
- echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
- retval=$?
- fi
-
- if [ $qmaster = true ]; then
- if [ `CheckIfQmasterHost $HOST` = true ]; then
- # Send SIGTERM to qmaster
- echo -n $"Stopping $master_prog: "
- killproc -p $master_pidfile $master_prog
- retval=`expr $retval + $?`
- fi
- fi
-
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- return $retval
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- # run checks to determine if the service is running or use generic status
- status $master_prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
- start)
- rh_status_q && exit 0
- [ -n "$2" ] && CheckArgs $2
- $1
- ;;
- stop)
- rh_status_q || exit 0
- [ -n "$2" ] && CheckArgs $2
- $1
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
- exit 2
-esac
-exit $?
diff --git a/sgemaster.service b/sgemaster.service
deleted file mode 100644
index 7c23a17..0000000
--- a/sgemaster.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Gridengine master daemon and scheduler
-After=network.target network-online.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/gridengine
-ExecStart=/usr/bin/sge_qmaster
-# If running under a different cell, copy this file to /etc/systemd/system/sgemaster.service
-# and change default below to the cell name
-PIDFile=/var/spool/gridengine/default/qmaster/qmaster.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sources b/sources
deleted file mode 100644
index 7fd8e40..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-5ba34d534cdeda9afe74cd367cb51ce0 gridengine-ppc.tar.gz
-a10b1e8f8677295fdbd55ecf7c8b785a GE2011.11p1.tar.gz
6 years, 10 months
Architecture specific change in rpms/gridengine.git
by githook-noreply@fedoraproject.org
The package rpms/gridengine.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gridengine.git/commit/?id=460094b....
Change:
-ExcludeArch: ppc64
Thanks.
Full change:
============
commit 460094b8525115216218ff5a31a65d9dc64448f6
Author: Orion Poplawski <orion(a)nwra.com>
Date: Fri Aug 18 14:10:49 2017 -0600
Mostly dead upstream and does not build with openssl 1.1
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ca401cf..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-ge-V62u5_TAG-src.tar.bz2
-gridengine-ppc.tar.gz
-/SGE6.2u5p2.tar.gz
-/GE2011.11.tar.gz
-/GE2011.11p1.tar.gz
diff --git a/Licenses b/Licenses
deleted file mode 100644
index 2e7fbc5..0000000
--- a/Licenses
+++ /dev/null
@@ -1,34 +0,0 @@
-Whole license: SISSL
-
-source/3rdparty/adoc/ GPL+ -> unused
-source/3rdparty/fnmatch/ BSD with advertising -> unused
-source/3rdparty/openssl/ OpenSSL -> unused
-source/3rdparty/qidl/ copyright only -> unused
-
-source/3rdparty/qmake/ GPL+ -> Installed as qmake
-source/3rdparty/qmake/alloca.c Public Domain? -> unused
-source/3rdparty/qmake/amiga.c GPLv2+ -> Installed as qmake
-(and others)
- ! Note
- qmake is not linked or used by other parts
- of gridengine
-
-source/3rdparty/qmon/Xbae/ MIT
-source/3rdparty/qmon/Xmt310/ BSD
-source/3rdparty/qmon/iconlist/ MIT
-source/3rdparty/qmon/ltree/ LGPL+
-source/3rdparty/qmon/spinbox/ MIT
-source/3rdparty/qmon/tab/ MIT
-
-source/3rdparty/qtcsh/ BSD with advertising -> Installed as qtcsh
-source/3rdparty/qtcsh/ma.setp.c MIT -> unused
- ! Note
- qtcsh is not linked or used by other parts
- of gridengine
-
-source/3rdparty/sge_depend/ MIT
-source/3rdparty/snprintf/ the Frontier Artistic License -> unused
-source/3rdparty/strptime/ BSD with advertising -> unused
-
-source/scripts/ldAix MIT -> unused
-
diff --git a/README b/README
deleted file mode 100644
index 0c1f854..0000000
--- a/README
+++ /dev/null
@@ -1,43 +0,0 @@
-Setting up a gridengine install using these RPMs is a little different than
-using the standard Sun courtesy binaries. The default configuration setup is geared
-for a "reduced NFS" install with logs going into the /var/spool/gridengine
-directories on each host.
-
-You probably want to edit /etc/hosts to remove any mentions of the hostname
-on the localhost line, like the following:
-
-127.0.0.1 localhost.localdomain localhost hostname
-
-- On the qmaster (and any shadow hosts) install gridengine-qmaster, then:
-
- 1)
- cd /usr/share/gridengine
- 2)
- ./install_qmaster [any desired options]
-
-OR
-
- edit my_configuration.conf to make any needed changes and run:
-
- ./install_qmaster -auto ./my_configuration.conf
-
- 3) Make sure the files act_qmaster, bootstrap, and settings.*sh from the
- directory /usr/share/gridengine/default/common/ are shared to all clients.
- If you don't run with a shadow master configuration you can simply copy
- these files to the other machines.
-
-If you change the default SGE_ROOT or SGE_CELL values, you will need to
-edit /etc/sysconfig/gridengine and change them there as well for the startup
-scripts to work.
-
-- On execution hosts install gridengine-execd, then:
-
- cd /usr/share/gridengine
- ./install_execd
-
-OR if you have a default install, you may be able to just do:
-
- systemctl enable sge_execd
- systemctl start sge_execd
-
-- On submit hosts install gridengine
diff --git a/README.mingw b/README.mingw
deleted file mode 100644
index 1894062..0000000
--- a/README.mingw
+++ /dev/null
@@ -1,8 +0,0 @@
-I took a look at compiling gridengine with mingw. Current stumbling block is
-that mingw32-w32api does not have pdh.h/libpdh.a (pdh.dll) from the Windows SDK.
-
-Filed: https://sourceforge.net/tracker/?func=detail&aid=3509880&group_id=2435&at...
-
-The patch gridengine-mingw.patch adds a -mingw32 flag for aimk to use for the
-compile step after dependencies have been generated. (Strange, but you need
-native tools to generate the deps)
diff --git a/conf_defaults b/conf_defaults
deleted file mode 100644
index b0f48f7..0000000
--- a/conf_defaults
+++ /dev/null
@@ -1,16 +0,0 @@
-SGE_ROOT="/usr/share/gridengine"
-SGE_QMASTER_PORT=6444
-SGE_EXECD_PORT=6445
-SGE_CLUSTER_NAME="p6444"
-SGE_JVM_LIB_PATH="none"
-QMASTER_SPOOL_DIR="/var/spool/gridengine/default/qmaster"
-EXECD_SPOOL_DIR="/var/spool/gridengine"
-GID_RANGE="16000-16100"
-DB_SPOOLING_DIR="/var/spool/gridengine/default/spooldb"
-ADMIN_HOST_LIST=""
-SUBMIT_HOST_LIST=""
-EXEC_HOST_LIST=""
-EXECD_SPOOL_DIR_LOCAL="/var/spool/gridengine"
-SET_FILE_PERMS="false"
-SHADOW_HOST=""
-EXEC_HOST_LIST_RM=""
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..717a078
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Mostly dead upstream and does not build with openssl 1.1
diff --git a/gridengine-6.2-jni.patch b/gridengine-6.2-jni.patch
deleted file mode 100644
index d4bec03..0000000
--- a/gridengine-6.2-jni.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gridengine/source/daemons/qmaster/sge_thread_jvm.c.jni 2008-07-10 10:05:22.000000000 -0600
-+++ gridengine/source/daemons/qmaster/sge_thread_jvm.c 2008-11-04 15:14:53.000000000 -0700
-@@ -766,11 +766,17 @@
- jvm_argv[2] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.caTop=%s", ctx->get_ca_root(ctx)));
- jvm_argv[3] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.serverKeystore=%s", keystore_path));
- jvm_argv[4] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.grid.jgdi.sgeQmasterSpoolDir=%s", ctx->get_qmaster_spool_dir(ctx)));
-- jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=%s/lib/jgdi.jar:%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
-+ char *libdir;
-+ if (strstr(sge_get_arch(),"64") != NULL) {
-+ libdir = "lib64";
-+ } else {
-+ libdir = "lib";
-+ }
-+ jvm_argv[5] = strdup(sge_dstring_sprintf(&ds, "-Djava.class.path=/usr/%s/gridengine/jgdi.jar:/usr/%s/gridengine/juti.jar", libdir, libdir));
- jvm_argv[6] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.policy=%s/common/jmx/java.policy", ctx->get_cell_root(ctx)));
- jvm_argv[7] = strdup("-Djava.security.manager=com.sun.grid.jgdi.management.JGDISecurityManager");
-- jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file://%s/lib/jgdi.jar file://%s/lib/juti.jar", ctx->get_sge_root(ctx), ctx->get_sge_root(ctx)));
-- jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=%s/lib/%s", ctx->get_sge_root(ctx), sge_get_arch()));
-+ jvm_argv[8] = strdup(sge_dstring_sprintf(&ds, "-Djava.rmi.server.codebase=file:///usr/%s/gridengine/jgdi.jar file:///usr/%s/gridengine/juti.jar", libdir, libdir));
-+ jvm_argv[9] = strdup(sge_dstring_sprintf(&ds, "-Djava.library.path=/usr/%s/gridengine", libdir));
- jvm_argv[10] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.access.file=%s/common/jmx/jmxremote.access", ctx->get_cell_root(ctx)));
- jvm_argv[11] = strdup(sge_dstring_sprintf(&ds, "-Dcom.sun.management.jmxremote.password.file=%s/common/jmx/jmxremote.password", ctx->get_cell_root(ctx)));
- jvm_argv[12] = strdup(sge_dstring_sprintf(&ds, "-Djava.security.auth.login.config=%s/common/jmx/jaas.config", ctx->get_cell_root(ctx)));
---- gridengine/source/libs/jgdi/util/java.policy.template.jni 2008-02-13 07:35:11.000000000 -0700
-+++ gridengine/source/libs/jgdi/util/java.policy.template 2008-11-06 09:32:31.000000000 -0700
-@@ -39,7 +39,7 @@
- ** grant principal javax.management.remote.JMXPrincipal "controlRole"
- **
- */
--grant codeBase "file:${com.sun.grid.jgdi.sgeRoot}/lib/jgdi.jar" {
-+grant codeBase "file:${java.library.path}/jgdi.jar" {
- permission java.net.SocketPermission "*:1024-", "accept,connect";
- permission java.net.SocketPermission "localhost:1024-", "listen,resolve";
- permission java.lang.RuntimePermission "loadLibrary.jgdi";
diff --git a/gridengine-6.2u2_1-izpack.patch b/gridengine-6.2u2_1-izpack.patch
deleted file mode 100644
index 8f00601..0000000
--- a/gridengine-6.2u2_1-izpack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gridengine/source/clients/gui-installer/build.xml.izpack 2009-02-16 04:15:38.000000000 -0700
-+++ gridengine/source/clients/gui-installer/build.xml 2009-03-25 14:05:54.000000000 -0600
-@@ -66,20 +66,20 @@
- <echo message="Check IzPack"/>
- <!-- Check IzPack is build, if not build it -->
- <condition property="izpack.isbuild">
-- <available file="${izpack.home}/_build"/>
-+ <available file="${izpack.lib}/standalone-compiler.jar"/>
- </condition>
- <antcall target="build.izpack"/>
- <!-- Check that IzPack was build and we have it on the classpath -->
- <condition property="izpack.complete">
- <available classpath="${javac.classpath}" classname="com.izforge.izpack.installer.IzPanel"/>
- </condition>
-- <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.home property in the gridengine/source/build_private.properties first!"/>
-+ <fail unless="izpack.complete" message="You need to install IzPack 4.1.1 and set the izpack.lib property in the gridengine/source/build_private.properties first!"/>
-
- <!-- Let's copy the stuff we need locally to our build.dir, so each user works with his own files -->
- <property name="build.panels.dir" value="bin/panels"/>
- <property name="compiler.path" value="${build.dir}/standalone-compiler.jar"/>
- <mkdir dir="${build.panels.dir}"/>
-- <copyfile src="${izpack.home}/lib/standalone-compiler.jar" dest="${compiler.path}"/>
-+ <copyfile src="${izpack.lib}/standalone-compiler.jar" dest="${compiler.path}"/>
-
- <echo message="Building prerequsities from source/3rdparty/IzPack/src ..."/>
- <javac srcdir="../../3rdparty/IzPack/src"
diff --git a/gridengine-6.2u2_1-sge_ca.patch b/gridengine-6.2u2_1-sge_ca.patch
deleted file mode 100644
index 97c5bd7..0000000
--- a/gridengine-6.2u2_1-sge_ca.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- gridengine/source/dist/util/sgeCA/sge_ca.sge_ca 2008-12-08 13:38:02.000000000 -0700
-+++ gridengine/source/dist/util/sgeCA/sge_ca 2009-03-19 16:11:13.000000000 -0600
-@@ -928,7 +928,10 @@
- return 1
- fi
-
-- JVM_ARGS="-cp $ROOT_PATH/lib/juti.jar"
-+ case "$ARCH" in
-+ *64) JVM_ARGS="-cp /usr/lib64/gridengine/juti.jar";;
-+ *) JVM_ARGS="-cp /usr/lib/gridengine/juti.jar";;
-+ esac
- JVM_ARGS="$JVM_ARGS -Djava.util.logging.config.file=$ROOT_PATH/util/sgeCA/logging.properties"
-
- OUTPUT=`$JAVA $JVM_ARGS com.sun.grid.ca.Main $CA_ARGS 2>&1`
-@@ -1722,22 +1725,6 @@
- exit 1
- fi
-
--if [ ! -d "$ROOT_PATH/lib/$ARCH" ]; then
-- echo
-- echo "Error: The lib directory \"$ROOT_PATH/lib/$ARCH\" does not exist"
-- echo "Please verify your setup and restart this script. Exit."
-- exit 1
--fi
--
--shlib_path_name=`$ROOT_PATH/util/arch -lib`
--old_shlib_path_name=`eval echo '$'$shlib_path_name`
--if [ x$old_shlib_path_name = x ]; then
-- eval $shlib_path_name=$ROOT_PATH/lib/$ARCH
--else
-- eval $shlib_path_name="$ROOT_PATH/lib/${ARCH}:${old_shlib_path_name}"
--fi
--export $shlib_path_name
--
- #---------------------------------------
- # setup INFOTEXT begin
- #---------------------------------------
-@@ -1776,7 +1763,7 @@
- #
- # Check wether all needed binaries are exists
- #
--for i in adminrun openssl uidgid; do
-+for i in adminrun uidgid; do
- if [ ! -x $V5UTILBIN/$i ]; then
- PrintErrorAndExit 1 "Error: Can't find binary \"%s\"" $V5UTILBIN/$i
- fi
-@@ -1805,7 +1792,7 @@
-
- CAKEY=cakey.pem
- CACERT=cacert.pem
--OPENSSL=$V5UTILBIN/openssl
-+OPENSSL=/usr/bin/openssl
-
- AUTO="false"
- #-----------------------------
diff --git a/gridengine-6.2u5-gethostname.patch b/gridengine-6.2u5-gethostname.patch
deleted file mode 100644
index aee2dca..0000000
--- a/gridengine-6.2u5-gethostname.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gridengine/source/dist/util/install_modules/inst_common.sh.gethostname 2010-08-26 07:57:41.000000000 +1200
-+++ gridengine/source/dist/util/install_modules/inst_common.sh 2010-11-23 10:24:51.932798405 +1300
-@@ -1569,18 +1569,37 @@
- #-------------------------------------------------------------------------
- # CheckForLocalHostResolving
- # "localhost", localhost.localdomain and 127.0.x.x are not supported
-+# if there are no other names or no other ip addresses
- #
- #
- CheckForLocalHostResolving()
- {
-- output=`$SGE_UTILBIN/gethostname| cut -f2 -d:`
-+ output=`$SGE_UTILBIN/gethostname| grep "^Host" | cut -f2 -d:`
-+
-+ notok=true
-+ hostok=false
-+ ipok=false
-
-- notok=false
- for cmp in $output; do
- case "$cmp" in
-- localhost*|127.0*)
-- notok=true
-+ (localhost*|127.0*)
- ;;
-+ (*)
-+ isIp=`IsIpAddress $cmp `
-+ if [ $? -eq 1 ]; then
-+ if [ $hostok = true ]; then
-+ notok=false
-+ break
-+ fi
-+ ipok=true
-+ else
-+ if [ $ipok = true ]; then
-+ notok=false
-+ break
-+ fi
-+ hostok=true
-+ fi
-+ ;;
- esac
- done
-
diff --git a/gridengine-add-aarch64.patch b/gridengine-add-aarch64.patch
deleted file mode 100644
index 4674ec8..0000000
--- a/gridengine-add-aarch64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-armv8* is 32bit on 64bit hardware
-
-Index: GE2011.11p1/source/dist/util/arch
-===================================================================
---- GE2011.11p1.orig/source/dist/util/arch
-+++ GE2011.11p1/source/dist/util/arch
-@@ -229,7 +229,7 @@ Linux)
- s390x)
- lxmachine=s390x
- ;;
-- armv8*)
-+ aarch64*)
- lxmachine=arm64
- ;;
- arm*)
-Index: GE2011.11p1/source/aimk
-===================================================================
---- GE2011.11p1.orig/source/aimk
-+++ GE2011.11p1/source/aimk
-@@ -2325,6 +2325,9 @@ if ( $JNI == 1 ) then
- set JAVA_LIB_ARCH = amd64
- endif
- breaksw
-+ case linux-arm64:
-+ set JAVA_LIB_ARCH = aarch64
-+ breaksw
- case linux-arm:
- set JAVA_LIB_ARCH = arm
- breaksw
diff --git a/gridengine-arm.patch b/gridengine-arm.patch
deleted file mode 100644
index a092a84..0000000
--- a/gridengine-arm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up GE2011.11/source/aimk.arm GE2011.11/source/aimk
---- GE2011.11/source/aimk.arm 2012-04-17 10:30:18.892872672 -0600
-+++ GE2011.11/source/aimk 2012-07-06 11:21:41.691920730 -0600
-@@ -2325,6 +2325,9 @@ if ( $JNI == 1 ) then
- set JAVA_LIB_ARCH = amd64
- endif
- breaksw
-+ case linux-arm:
-+ set JAVA_LIB_ARCH = arm
-+ breaksw
- case linux-ia64:
- set JAVA_LIB_ARCH = ia64
- breaksw
diff --git a/gridengine-format.patch b/gridengine-format.patch
deleted file mode 100644
index 6eb807a..0000000
--- a/gridengine-format.patch
+++ /dev/null
@@ -1,4339 +0,0 @@
-diff -up GE2011.11p1/source/3rdparty/qmake/remote-stub.c.format GE2011.11p1/source/3rdparty/qmake/remote-stub.c
---- GE2011.11p1/source/3rdparty/qmake/remote-stub.c.format 2012-05-23 13:04:55.000000000 -0600
-+++ GE2011.11p1/source/3rdparty/qmake/remote-stub.c 2014-10-03 21:18:11.271530498 -0600
-@@ -342,7 +342,7 @@ static void remote_exit(int code, const
- }
-
- if(message) {
-- fprintf(stderr, message);
-+ fprintf(stderr, "%s", message);
- }
-
- if(reason) {
-diff -up GE2011.11p1/source/clients/common/read_defaults.c.format GE2011.11p1/source/clients/common/read_defaults.c
---- GE2011.11p1/source/clients/common/read_defaults.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/common/read_defaults.c 2014-10-03 21:11:16.286851285 -0600
-@@ -223,7 +223,7 @@ static char *get_cwd_defaults_file_path(
- DENTER (TOP_LAYER, "get_cwd_defaults_file_name");
-
- if (!getcwd(cwd, sizeof(cwd))) {
-- sprintf(str, MSG_FILE_CANTREADCURRENTWORKINGDIR);
-+ sprintf(str, "%s", MSG_FILE_CANTREADCURRENTWORKINGDIR);
- answer_list_add(answer_list, str, STATUS_EDISK, ANSWER_QUALITY_ERROR);
- }
-
-diff -up GE2011.11p1/source/clients/common/sge_cqueue_qconf.c.format GE2011.11p1/source/clients/common/sge_cqueue_qconf.c
---- GE2011.11p1/source/clients/common/sge_cqueue_qconf.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/common/sge_cqueue_qconf.c 2014-10-03 21:11:16.286851285 -0600
-@@ -788,7 +788,7 @@ cqueue_list_sick(sge_gdi_ctx_class_t *ct
- }
-
- if (sge_dstring_get_string(&ds)) {
-- printf(sge_dstring_get_string(&ds));
-+ printf("%s", sge_dstring_get_string(&ds));
- ret = false;
- }
-
-diff -up GE2011.11p1/source/clients/qacct/qacct.c.format GE2011.11p1/source/clients/qacct/qacct.c
---- GE2011.11p1/source/clients/qacct/qacct.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qacct/qacct.c 2014-10-03 21:11:16.287851309 -0600
-@@ -460,7 +460,7 @@ int main(int argc, char **argv)
- options.arflag = 1;
- } else {
- if (sscanf(argv[++ii], sge_u32, &options.ar_number) != 1) {
-- fprintf(stderr, MSG_PARSE_INVALID_AR_MUSTBEUINT);
-+ fprintf(stderr, "%s", MSG_PARSE_INVALID_AR_MUSTBEUINT);
- fprintf(stderr, "\n");
- qacct_usage(&ctx, stderr);
- DRETURN(1);
-@@ -694,7 +694,7 @@ int main(int argc, char **argv)
- QAJ_arid);
- summary_view = true;
- if (sorted_list == NULL || sort_order == NULL) {
-- ERROR((SGE_EVENT, MSG_HISTORY_NOTENOUGTHMEMORYTOCREATELIST));
-+ ERROR((SGE_EVENT, "%s", MSG_HISTORY_NOTENOUGTHMEMORYTOCREATELIST));
- goto QACCT_EXIT;
- }
- }
-@@ -891,7 +891,7 @@ int main(int argc, char **argv)
- SGE_EXIT((void**)&ctx, 0);
- }
- } else if (options.taskstart && options.taskend && options.taskstep) {
-- ERROR((SGE_EVENT, MSG_HISTORY_TOPTIONREQUIRESJOPTION ));
-+ ERROR((SGE_EVENT, "%s", MSG_HISTORY_TOPTIONREQUIRESJOPTION ));
- qacct_usage(&ctx, stderr);
- free_qacct_lists(¢ry_list, &queue_list, &exechost_list, &hgrp_list);
- SGE_EXIT((void**)&ctx, 0);
-diff -up GE2011.11p1/source/clients/qconf/parse_qconf.c.format GE2011.11p1/source/clients/qconf/parse_qconf.c
---- GE2011.11p1/source/clients/qconf/parse_qconf.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qconf/parse_qconf.c 2014-10-03 21:11:16.288851332 -0600
-@@ -3082,7 +3082,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t
- /* parse command line arguments */
- attr = sge_strdup(NULL, *spp);
- if (attr == NULL) {
-- ERROR((SGE_EVENT, MSG_QCONF_NOATTRIBUTEGIVEN));
-+ ERROR((SGE_EVENT, "%s", MSG_QCONF_NOATTRIBUTEGIVEN));
- DRETURN(1);
- }
- spp = sge_parser_get_next(ctx, spp);
-@@ -3327,7 +3327,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t
- }
-
- if (ep == NULL) {
-- fprintf(stderr, errstr);
-+ fprintf(stderr, "%s", errstr);
- if (sge_error_and_exit(ctx, MSG_FILE_ERRORREADINGINFILE))
- continue;
- }
-@@ -4174,7 +4174,7 @@ int sge_parse_qconf(sge_gdi_ctx_class_t
- lFreeElem(&hep);
- }
- else {
-- fprintf(stderr, MSG_ANSWER_NEEDHOSTNAMETODELLOCALCONFIG);
-+ fprintf(stderr, "%s", MSG_ANSWER_NEEDHOSTNAMETODELLOCALCONFIG);
- fprintf(stderr, "\n");
- sge_parse_return = 1;
- }
-@@ -6324,7 +6324,7 @@ static int show_eventclients(sge_gdi_ctx
- }
- }
- else {
-- fprintf(stderr, MSG_QCONF_NOEVENTCLIENTSREGISTERED);
-+ fprintf(stderr, "%s", MSG_QCONF_NOEVENTCLIENTSREGISTERED);
- fprintf(stderr, "\n");
- }
- lFreeList(&alp);
-@@ -6432,7 +6432,7 @@ static int show_processors(sge_gdi_ctx_c
- printf("\n");
- }
- else {
-- fprintf(stderr, MSG_QCONF_NOEXECUTIONHOSTSDEFINED );
-+ fprintf(stderr, "%s", MSG_QCONF_NOEXECUTIONHOSTSDEFINED );
- fprintf(stderr, "\n");
- }
-
-@@ -7093,7 +7093,7 @@ static int qconf_modify_attribute(sge_gd
- DRETURN(1);
- }
- if (*epp == NULL){
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_FILE_ERRORREADINGINFILE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_FILE_ERRORREADINGINFILE));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DRETURN(1);
- }
-@@ -7231,7 +7231,7 @@ static int qconf_modify_attribute(sge_gd
- lList *lp = lGetList(*epp, fields[0]);
-
- if (lp == NULL || lGetNumberOfElem(lp) == 0) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_QCONF_CANT_MODIFY_NONE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_QCONF_CANT_MODIFY_NONE));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- lFreeElem(epp);
- lFreeWhat(&what);
-@@ -7249,7 +7249,7 @@ static int qconf_modify_attribute(sge_gd
- for (nm = ep->descr[0].nm; nm != NoName; nm = ep->descr[count++].nm) {
- if (lGetType(ep->descr, nm) == lListT) {
- if (lGetList(ep, nm) == NULL) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_QCONF_CANT_MODIFY_NONE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_QCONF_CANT_MODIFY_NONE));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- lFreeElem(epp);
- lFreeWhat(&what);
-diff -up GE2011.11p1/source/clients/qmod/qmod.c.format GE2011.11p1/source/clients/qmod/qmod.c
---- GE2011.11p1/source/clients/qmod/qmod.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmod/qmod.c 2014-10-03 21:11:16.289851355 -0600
-@@ -472,7 +472,7 @@ int usageshowed = 0;
- }
-
- if(lGetNumberOfElem(*ppcmdline)) {
-- sprintf(str, MSG_PARSE_TOOMANYOPTIONS);
-+ sprintf(str, "%s", MSG_PARSE_TOOMANYOPTIONS);
- if(!usageshowed)
- qmod_usage(stderr, NULL);
- answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
-diff -up GE2011.11p1/source/clients/qmon/qmon_arsub.c.format GE2011.11p1/source/clients/qmon/qmon_arsub.c
---- GE2011.11p1/source/clients/qmon/qmon_arsub.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_arsub.c 2014-10-03 21:11:16.289851355 -0600
-@@ -809,7 +809,7 @@ static void qmonARSubARSub(Widget w, XtP
- pe = strtok(theInput, " ");
- pe_range = strtok(NULL, "\n");
- if (!(pe_range && pe_range[0] != '\0')) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -822,7 +822,7 @@ static void qmonARSubARSub(Widget w, XtP
- 1, 0, INF_ALLOWED);
- lFreeList(&range_list);
- if (alp) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -835,7 +835,7 @@ static void qmonARSubARSub(Widget w, XtP
-
- if (!(lp = lCreateElemList("ARSubList", AR_Type, 1))) {
- DPRINTF(("lCreateElemList failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "AR submission failed",
- "AR submission failed")
-@@ -845,7 +845,7 @@ static void qmonARSubARSub(Widget w, XtP
-
- if (!qmonARSMToCull(&ARSMData, lFirst(lp), 0)) {
- DPRINTF(("qmonARSMToCull failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "AR submission failed",
- "AR submission failed")
-@@ -885,7 +885,7 @@ static void qmonARSubARSub(Widget w, XtP
- XmtLocalize(w, "AR %d failed", "AR %d failed"),
- ar_id);
- } else {
-- XmtMsgLinePrintf(arsub_message,
-+ XmtMsgLinePrintf(arsub_message, "%s",
- XmtLocalize(w, "AR Submission failed",
- "AR Submission failed"));
- }
-diff -up GE2011.11p1/source/clients/qmon/qmon_comm.c.format GE2011.11p1/source/clients/qmon/qmon_comm.c
---- GE2011.11p1/source/clients/qmon/qmon_comm.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_comm.c 2014-10-03 21:11:16.290851379 -0600
-@@ -221,7 +221,7 @@ lList **answerp
- }
-
- if (ctx->is_alive(ctx) != CL_RETVAL_OK) {
-- sprintf(msg, XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
-+ sprintf(msg, "%s", XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
- contact_ok = XmtDisplayErrorAndAsk(AppShell, "nocontact",
- msg, "@{Retry}", "@{Abort}",
- XmtYesButton, NULL);
-diff -up GE2011.11p1/source/clients/qmon/qmon_main.c.format GE2011.11p1/source/clients/qmon/qmon_main.c
---- GE2011.11p1/source/clients/qmon/qmon_main.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_main.c 2014-10-03 21:11:16.290851379 -0600
-@@ -359,19 +359,19 @@ static void qmonUsage(Widget w)
-
- printf("%s %s\n", GE_SHORTNAME, GDI_VERSION);
- /* printf("%s\n", feature_get_product_name(FS_SHORT_VERSION, &ds)); */
-- printf(XmtLocalize2(w, "usage: qmon\n", "qmon_usage", "usageTitle"));
-+ printf("%s", XmtLocalize2(w, "usage: qmon\n", "qmon_usage", "usageTitle"));
- printf(" [-cmap] ");
-- printf(XmtLocalize2(w, "use own colormap\n", "qmon_usage", "cmapOption"));
-+ printf("%s", XmtLocalize2(w, "use own colormap\n", "qmon_usage", "cmapOption"));
- printf(" [-help] ");
-- printf(XmtLocalize2(w, "show this information and exit\n",
-+ printf("%s", XmtLocalize2(w, "show this information and exit\n",
- "qmon_usage", "helpOption"));
- printf(" [-fontFamily {big|medium|small}] ");
-- printf(XmtLocalize2(w, "use small/medium/big fonts\n",
-+ printf("%s", XmtLocalize2(w, "use small/medium/big fonts\n",
- "qmon_usage", "fontFamilyOption"));
- printf(" [-nologo] ");
-- printf(XmtLocalize2(w, "startup without logo\n",
-+ printf("%s", XmtLocalize2(w, "startup without logo\n",
- "qmon_usage", "nologoOption"));
-- printf(XmtLocalize2(w, "Additionally the default X commandline switches can be used.\nFor further information see the manual page X(1)\n",
-+ printf("%s", XmtLocalize2(w, "Additionally the default X commandline switches can be used.\nFor further information see the manual page X(1)\n",
- "qmon_usage", "X11OptionInfo"));
-
- DEXIT;
-diff -up GE2011.11p1/source/clients/qmon/qmon_message.c.format GE2011.11p1/source/clients/qmon/qmon_message.c
---- GE2011.11p1/source/clients/qmon/qmon_message.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_message.c 2014-10-03 21:11:16.290851379 -0600
-@@ -86,7 +86,7 @@ void qmonMessageShow(Widget w, Boolean m
- }
-
- if (msg_box) {
-- XmtDisplayWarningMsg(w, "XmtMessageBox", buf, "Warning", NULL);
-+ XmtDisplayWarningMsg(w, "XmtMessageBox", "%x", "Warning", NULL, buf);
- XSync(XtDisplay(w), 0);
- XmUpdateDisplay(w);
- }
-diff -up GE2011.11p1/source/clients/qmon/qmon_preferences.c.format GE2011.11p1/source/clients/qmon/qmon_preferences.c
---- GE2011.11p1/source/clients/qmon/qmon_preferences.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_preferences.c 2014-10-03 21:11:16.291851402 -0600
-@@ -469,7 +469,7 @@ static lListElem* read_object( const cha
- if (!(ep = lCreateElem(args->objtype))) {
- FCLOSE(fp);
- free(buf);
-- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- DEXIT;
- return NULL;
- }
-@@ -477,7 +477,7 @@ static lListElem* read_object( const cha
- /* read in config file */
- if (read_config_list(fp, &clp, &alp, CF_Type, CF_name, CF_value,
- CF_sublist, NULL, read_config_list_flag, buf, size)) {
-- ERROR((SGE_EVENT, lGetString(lFirst(alp), AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(lFirst(alp), AN_text)));
- lFreeList(&alp);
- FCLOSE(fp);
- free(buf);
-@@ -492,7 +492,7 @@ static lListElem* read_object( const cha
- ret = args->work_func(&alp, &clp, fields, ep, spool, flag, tag, 0);
- if (ret) {
- if (alp)
-- ERROR((SGE_EVENT, lGetString(lFirst(alp), AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(lFirst(alp), AN_text)));
- lFreeList(&alp);
- lFreeList(&clp);
- lFreeElem(&ep);
-diff -up GE2011.11p1/source/clients/qmon/qmon_submit.c.format GE2011.11p1/source/clients/qmon/qmon_submit.c
---- GE2011.11p1/source/clients/qmon/qmon_submit.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_submit.c 2014-10-03 21:11:16.292851425 -0600
-@@ -1366,7 +1366,7 @@ static void qmonSubmitJobSubmit(Widget w
- */
- if ((!SMData.job_script || SMData.job_script[0] == '\0') &&
- !ISSET(submit_mode_data.sub_mode, SUBMIT_QSH)) {
-- sprintf(buf, XmtLocalize(w, "Job Script required !",
-+ sprintf(buf, "%s", XmtLocalize(w, "Job Script required !",
- "Job Script required !"));
- goto error;
- }
-@@ -1381,7 +1381,7 @@ static void qmonSubmitJobSubmit(Widget w
- pe = strtok(theInput, " ");
- pe_range = strtok(NULL, "\n");
- if (!(pe_range && pe_range[0] != '\0')) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -1394,7 +1394,7 @@ static void qmonSubmitJobSubmit(Widget w
- 1, 0, INF_ALLOWED);
- lFreeList(&range_list);
- if (alp) {
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Parallel Environment requires valid name and valid range !",
- "Parallel Environment requires valid name and valid range !")
-@@ -1407,7 +1407,7 @@ static void qmonSubmitJobSubmit(Widget w
-
- if (!(lp = lCreateElemList("JobSubmitList", JB_Type, 1))) {
- DPRINTF(("lCreateElemList failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Job submission failed",
- "Job submission failed")
-@@ -1417,7 +1417,7 @@ static void qmonSubmitJobSubmit(Widget w
-
- if (!qmonSMToCull(&SMData, lFirst(lp), 0)) {
- DPRINTF(("qmonSMToCull failure\n"));
-- sprintf(buf,
-+ sprintf(buf, "%s",
- XmtLocalize(w,
- "Job submission failed",
- "Job submission failed")
-@@ -1431,7 +1431,7 @@ static void qmonSubmitJobSubmit(Widget w
- if (set_sec_cred(sge_root, mastername, lFirst(lp), &alp) != 0) {
- qmonMessageBox(w, alp, true);
- lFreeList(&alp);
-- sprintf(buf, MSG_SEC_SETJOBCRED);
-+ sprintf(buf, "%s", MSG_SEC_SETJOBCRED);
- sprintf(buf, "\n");
- goto error;
- }
-@@ -1481,7 +1481,7 @@ static void qmonSubmitJobSubmit(Widget w
- XmtLocalize(w, "Job %d failed", "Job %d failed"),
- jobid);
- else
-- XmtMsgLinePrintf(submit_message,
-+ XmtMsgLinePrintf(submit_message, "%s",
- XmtLocalize(w, "Job Submission failed",
- "Job Submission failed"));
- XmtMsgLineClear(submit_message, DISPLAY_MESSAGE_DURATION);
-diff -up GE2011.11p1/source/clients/qmon/qmon_ticket.c.format GE2011.11p1/source/clients/qmon/qmon_ticket.c
---- GE2011.11p1/source/clients/qmon/qmon_ticket.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_ticket.c 2014-10-03 21:11:16.292851425 -0600
-@@ -503,9 +503,9 @@ static void qmonTOVApply(Widget w, XtPoi
- qmonMessageBox(w, alp, 0);
-
- if (alp && lGetUlong(lFirst(alp), AN_status) != STATUS_OK)
-- XmtMsgLinePrintf(tov_message, XmtLocalize(w, "Failure", "Failure"));
-+ XmtMsgLinePrintf(tov_message, "%s", XmtLocalize(w, "Failure", "Failure"));
- else
-- XmtMsgLinePrintf(tov_message, XmtLocalize(w, "Success", "Success"));
-+ XmtMsgLinePrintf(tov_message, "%s", XmtLocalize(w, "Success", "Success"));
- XmtMsgLineClear(tov_message, DISPLAY_MESSAGE_DURATION);
-
- data_changed = False;
-diff -up GE2011.11p1/source/clients/qmon/qmon_timer.c.format GE2011.11p1/source/clients/qmon/qmon_timer.c
---- GE2011.11p1/source/clients/qmon/qmon_timer.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_timer.c 2014-10-03 21:11:16.292851425 -0600
-@@ -393,7 +393,7 @@ XtIntervalId *id
- DENTER(GUI_LAYER, "qmonTimerCheckInteractiveJob");
-
- if (ctx->is_alive(ctx) != CL_RETVAL_OK) {
-- sprintf(msg, XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
-+ sprintf(msg, "%s", XmtLocalize(AppShell, "cannot reach qmaster", "cannot reach qmaster"));
- contact_ok = XmtDisplayErrorAndAsk(AppShell, "nocontact",
- msg, "@{Retry}", "@{Abort}",
- XmtYesButton, NULL);
-diff -up GE2011.11p1/source/clients/qmon/qmon_util.c.format GE2011.11p1/source/clients/qmon/qmon_util.c
---- GE2011.11p1/source/clients/qmon/qmon_util.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/qmon_util.c 2014-10-03 21:11:16.293851448 -0600
-@@ -960,7 +960,7 @@ void XmListAddItemUniqueSorted(Widget li
- if (item[0] == '@' && item[1] != '{')
- sprintf(buf, "@%s", item);
- else
-- sprintf(buf, item);
-+ sprintf(buf, "%s", item);
- xmitem = XmtCreateLocalizedXmString(list, buf);
- if (XmListItemExists(list, xmitem)) {
- XmStringFree(xmitem);
-diff -up GE2011.11p1/source/clients/qrsh/qrsh_starter.c.format GE2011.11p1/source/clients/qrsh/qrsh_starter.c
---- GE2011.11p1/source/clients/qrsh/qrsh_starter.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qrsh/qrsh_starter.c 2014-10-03 21:11:16.293851448 -0600
-@@ -239,7 +239,7 @@ static char *setEnvironment(const char *
- strcpy(command, line + 13);
- } else if (strncmp(line, "QRSH_WRAPPER=", 13) == 0) {
- if (*(line + 13) == 0) {
-- fprintf(stderr, MSG_QRSH_STARTER_EMPTY_WRAPPER);
-+ fprintf(stderr, "%s", MSG_QRSH_STARTER_EMPTY_WRAPPER);
- fprintf(stderr, "\n");
- } else {
- if ((*wrapper = (char *)malloc(strlen(line) - 13 + 1)) == NULL) {
-diff -up GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c.format GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c
---- GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qrstat/qrstat_report_handler_xml.c 2014-10-03 21:11:16.293851448 -0600
-@@ -261,7 +261,7 @@ qrstat_report_finish(qrstat_report_handl
- DENTER(TOP_LAYER, "qrstat_report_finish");
-
- sge_dstring_append(buffer, "</qrstat>\n");
-- printf(sge_dstring_get_string((dstring *)handler->ctx));
-+ printf("%s", sge_dstring_get_string((dstring *)handler->ctx));
-
- DRETURN(ret);
- }
-diff -up GE2011.11p1/source/clients/qsh/parse_job_qsh.c.format GE2011.11p1/source/clients/qsh/parse_job_qsh.c
---- GE2011.11p1/source/clients/qsh/parse_job_qsh.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/qsh/parse_job_qsh.c 2014-10-03 21:11:16.294851472 -0600
-@@ -288,7 +288,7 @@ lList *cull_parse_qsh_parameter(u_long32
- char str[1024];
-
- lRemoveElem(cmdline, &ep);
-- sprintf(str, MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
-+ sprintf(str, "%s", MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
- answer_list_add(&answer, str, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- lFreeList(&path_alias);
- DEXIT;
-diff -up GE2011.11p1/source/clients/qsh/qsh.c.format GE2011.11p1/source/clients/qsh/qsh.c
---- GE2011.11p1/source/clients/qsh/qsh.c.format 2012-05-23 13:04:45.000000000 -0600
-+++ GE2011.11p1/source/clients/qsh/qsh.c 2014-10-03 21:11:16.294851472 -0600
-@@ -450,7 +450,7 @@ static char *read_from_qrsh_socket(int m
- return NULL;
- } else {
- if (rval == 0) {
-- ERROR((SGE_EVENT, MSG_QSH_ERRORENDINGCONNECTION));
-+ ERROR((SGE_EVENT, "%s", MSG_QSH_ERRORENDINGCONNECTION));
- DEXIT;
- return NULL;
- }
-@@ -501,7 +501,7 @@ static int get_remote_exit_code(int sock
-
- DENTER(TOP_LAYER, "get_remote_exit_code");
-
-- VERBOSE_LOG((stderr, MSG_QSH_READINGEXITCODEFROMSHEPHERD));
-+ VERBOSE_LOG((stderr, "%s", MSG_QSH_READINGEXITCODEFROMSHEPHERD));
-
- msgsock = wait_for_qrsh_socket(sock, QSH_SOCKET_FINAL_TIMEOUT);
- if (msgsock != -1) {
-@@ -518,7 +518,7 @@ static int get_remote_exit_code(int sock
- }
- }
-
-- ERROR((SGE_EVENT, MSG_QSH_ERRORREADINGRETURNCODEOFREMOTECOMMAND));
-+ ERROR((SGE_EVENT, "%s", MSG_QSH_ERRORREADINGRETURNCODEOFREMOTECOMMAND));
- DEXIT;
- return -1;
- }
-@@ -567,7 +567,7 @@ static const char *quote_argument(const
- new_arg = malloc(strlen(arg) + 3);
-
- if (new_arg == NULL) {
-- ERROR((SGE_EVENT, MSG_QSH_MALLOCFAILED));
-+ ERROR((SGE_EVENT, "%s", MSG_QSH_MALLOCFAILED));
- DEXIT;
- return NULL;
- }
-@@ -762,7 +762,7 @@ static int start_client_program(const ch
-
- /* create an argument list */
- if (!sge_sl_create(&sl_args)) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- exit(EXIT_FAILURE);
- }
-
-@@ -1020,7 +1020,7 @@ get_client_name(sge_gdi_ctx_class_t *ctx
- /* get configuration from qmaster */
- if (gdi2_get_configuration(ctx, qualified_hostname, &global, &local) ||
- merge_configuration(NULL, progid, cell_root, global, local, &conf_list)) {
-- ERROR((SGE_EVENT, MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
- lFreeList(&conf_list);
- lFreeElem(&global);
- lFreeElem(&local);
-@@ -1031,7 +1031,7 @@ get_client_name(sge_gdi_ctx_class_t *ctx
- /* search for config entry */
- qlogin_cmd_elem = lGetElemStr(conf_list, CF_name, config_name);
- if (qlogin_cmd_elem == NULL) {
-- ERROR((SGE_EVENT, MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_CANTGETCONFIGURATIONFROMQMASTER));
- lFreeList(&conf_list);
- lFreeElem(&global);
- lFreeElem(&local);
-@@ -2004,7 +2004,7 @@ int main(int argc, char **argv)
- }
- }
-
-- VERBOSE_LOG((stderr, MSG_QSH_WAITINGFORINTERACTIVEJOBTOBESCHEDULED));
-+ VERBOSE_LOG((stderr, "%s", MSG_QSH_WAITINGFORINTERACTIVEJOBTOBESCHEDULED));
-
- DPRINTF(("R E A D I N G J O B ! ! ! ! ! ! ! ! ! ! !\n"));
- DPRINTF(("============================================\n"));
-@@ -2186,7 +2186,7 @@ int main(int argc, char **argv)
-
- do_shut = shut_me_down;
- if (do_shut || do_exit) {
-- WARNING((SGE_EVENT, MSG_QSH_REQUESTFORINTERACTIVEJOBHASBEENCANCELED));
-+ WARNING((SGE_EVENT, "%s", MSG_QSH_REQUESTFORINTERACTIVEJOBHASBEENCANCELED));
- delete_job(ctx, job_id, lp_jobs);
- lFreeList(&lp_poll);
- do_exit = 1;
-@@ -2259,7 +2259,7 @@ int main(int argc, char **argv)
- * so exit qrsh/qlogin with real exit_status.
- */
- if (g_new_interactive_job_support == false) {
-- WARNING((SGE_EVENT, MSG_QSH_CANTSTARTINTERACTIVEJOB));
-+ WARNING((SGE_EVENT, "%s", MSG_QSH_CANTSTARTINTERACTIVEJOB));
- do_exit = 1;
- exit_status = 1;
- } else {
-diff -up GE2011.11p1/source/clients/qstat/qstat.c.format GE2011.11p1/source/clients/qstat/qstat.c
---- GE2011.11p1/source/clients/qstat/qstat.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qstat/qstat.c 2014-10-03 21:11:16.295851495 -0600
-@@ -1697,7 +1697,7 @@ static int qstat_stdout_queue_load_alarm
- {
- DENTER(TOP_LAYER, "qstat_stdout_queue_load_alarm");
- printf("\t");
-- printf(reason);
-+ printf("%s", reason);
- printf("\n");
- DEXIT;
- return 0;
-@@ -1707,7 +1707,7 @@ static int qstat_stdout_queue_suspend_al
- {
- DENTER(TOP_LAYER, "qstat_stdout_queue_suspend_alarm");
- printf("\t");
-- printf(reason);
-+ printf("%s", reason);
- printf("\n");
- DEXIT;
- return 0;
-@@ -1717,7 +1717,7 @@ static int qstat_stdout_queue_message(qs
- {
- DENTER(TOP_LAYER, "qstat_stdout_queue_message");
- printf("\t");
-- printf(message);
-+ printf("%s", message);
- printf("\n");
- DEXIT;
- return 0;
-diff -up GE2011.11p1/source/clients/qstat/qstat_cmdline.c.format GE2011.11p1/source/clients/qstat/qstat_cmdline.c
---- GE2011.11p1/source/clients/qstat/qstat_cmdline.c.format 2012-05-23 13:04:46.000000000 -0600
-+++ GE2011.11p1/source/clients/qstat/qstat_cmdline.c 2014-10-03 21:11:16.295851495 -0600
-@@ -302,7 +302,7 @@ qstat_usage(int qselect_mode, FILE *fp,
- }
-
- if (getenv("MORE_INFO")) {
-- fprintf(fp, MSG_QSTAT_USAGE_ADDITIONALDEBUGGINGOPTIONS);
-+ fprintf(fp, "%s", MSG_QSTAT_USAGE_ADDITIONALDEBUGGINGOPTIONS);
- fprintf(fp, " [-dj] %s\n",MSG_QSTAT_USAGE_DUMPCOMPLETEJOBLISTTOSTDOUT);
- fprintf(fp, " [-dq] %s\n",MSG_QSTAT_USAGE_DUMPCOMPLETEQUEUELISTTOSTDOUT);
- }
-diff -up GE2011.11p1/source/clients/qsub/qsub.c.format GE2011.11p1/source/clients/qsub/qsub.c
---- GE2011.11p1/source/clients/qsub/qsub.c.format 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qsub/qsub.c 2014-10-03 21:11:16.296851518 -0600
-@@ -361,7 +361,7 @@ main(int argc, char **argv)
- }
- printf("\n");
- } else {
-- printf(MSG_JOB_VERIFYFOUNDQ);
-+ printf("%s", MSG_JOB_VERIFYFOUNDQ);
- printf("\n");
- }
-
-@@ -702,5 +702,5 @@ static int report_exit_status(int stat,
- *******************************************************************************/
- static void error_handler(const char *message)
- {
-- fprintf(stderr, message);
-+ fprintf(stderr, "%s", message);
- }
-diff -up GE2011.11p1/source/common/parse_job_cull.c.format GE2011.11p1/source/common/parse_job_cull.c
---- GE2011.11p1/source/common/parse_job_cull.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/common/parse_job_cull.c 2014-10-03 21:11:16.296851518 -0600
-@@ -361,7 +361,7 @@ lList *cull_parse_job_parameter(u_long32
-
- if ((ep = lGetElemStr(cmdline, SPA_switch, "-help"))) {
- lRemoveElem(cmdline, &ep);
-- sprintf(error_string, MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
-+ sprintf(error_string, "%s", MSG_ANSWER_HELPNOTALLOWEDINCONTEXT);
- answer_list_add(&answer, error_string,
- STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- DRETURN(answer);
-diff -up GE2011.11p1/source/common/parse_qsub.c.format GE2011.11p1/source/common/parse_qsub.c
---- GE2011.11p1/source/common/parse_qsub.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/common/parse_qsub.c 2014-10-03 21:11:16.297851542 -0600
-@@ -1814,7 +1814,7 @@ DTRACE;
-
- sp++;
- if (!*sp) {
-- sprintf(str, MSG_PARSE_ATSIGNOPTIONMUSTHAVEFILEARGUMENT);
-+ sprintf(str, "%s", MSG_PARSE_ATSIGNOPTIONMUSTHAVEFILEARGUMENT);
- answer_list_add(&answer, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return answer;
-diff -up GE2011.11p1/source/daemons/common/admin_mail.c.format GE2011.11p1/source/daemons/common/admin_mail.c
---- GE2011.11p1/source/daemons/common/admin_mail.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/admin_mail.c 2014-10-03 21:11:16.297851542 -0600
-@@ -236,7 +236,7 @@ void job_related_adminmail(u_long32 prog
- sprintf(str_general, MSG_GFSTATE_JOB_U, sge_u32c(jobid));
- }
- else {
-- sprintf(str_general, MSG_NONE);
-+ sprintf(str_general, "%s", MSG_NONE);
- }
- } else {
- /* This is a pe task */
-diff -up GE2011.11p1/source/daemons/common/mail.c.format GE2011.11p1/source/daemons/common/mail.c
---- GE2011.11p1/source/daemons/common/mail.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/mail.c 2014-10-03 21:11:16.297851542 -0600
-@@ -101,7 +101,7 @@ void cull_mail(u_long32 progid, lList *u
- user = lGetString(ep, MR_user);
- host = lGetHost(ep, MR_host);
- if (!user && !host) {
-- ERROR((SGE_EVENT, MSG_MAIL_EMPTYUSERHOST));
-+ ERROR((SGE_EVENT, "%s", MSG_MAIL_EMPTYUSERHOST));
- FREE(mailer);
- DRETURN_VOID;
- } else if (!host) {
-@@ -277,13 +277,13 @@ const char *buf
- alarm(0);
- if (pid2 == 0) { /* how could this happen? */
- kill(pid, SIGKILL);
-- ERROR((SGE_EVENT, MSG_MAIL_NOMAIL1));
-+ ERROR((SGE_EVENT, "%s", MSG_MAIL_NOMAIL1));
- exit(1);
- }
-
- if (pid2 == -1) { /* alarm must have went off */
- kill(pid, SIGKILL);
-- ERROR((SGE_EVENT, MSG_MAIL_NOMAIL2));
-+ ERROR((SGE_EVENT, "%s", MSG_MAIL_NOMAIL2));
- exit(1);
- }
-
-diff -up GE2011.11p1/source/daemons/common/procfs.c.format GE2011.11p1/source/daemons/common/procfs.c
---- GE2011.11p1/source/daemons/common/procfs.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/procfs.c 2014-10-03 21:11:16.298851565 -0600
-@@ -206,7 +206,7 @@ void procfs_kill_addgrpid(gid_t add_grp_
- if (shepherd_trace) {
- char err_str[256];
-
-- sprintf(err_str, MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY );
-+ sprintf(err_str, "%s", MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY );
- shepherd_trace(err_str);
- }
- /*
-@@ -222,7 +222,7 @@ void procfs_kill_addgrpid(gid_t add_grp_
- if (shepherd_trace) {
- char err_str[256];
-
-- sprintf(err_str, MSG_SGE_PROCFSKILLADDGRPIDMALLOCFAILED );
-+ sprintf(err_str, "%s", MSG_SGE_PROCFSKILLADDGRPIDMALLOCFAILED );
- shepherd_trace(err_str);
- }
-
-@@ -416,14 +416,14 @@ time_t last_time
-
- max_groups = sge_sysconf(SGE_SYSCONF_NGROUPS_MAX);
- if (max_groups <= 0) {
-- ERROR((SGE_EVENT, MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY));
-+ ERROR((SGE_EVENT, "%s", MSG_SGE_NGROUPS_MAXOSRECONFIGURATIONNECESSARY));
- DEXIT;
- return 1;
- }
-
- list = (gid_t*) malloc(max_groups*sizeof(gid_t));
- if (list == NULL) {
-- ERROR((SGE_EVENT, MSG_SGE_PTDISPATCHPROCTOJOBMALLOCFAILED));
-+ ERROR((SGE_EVENT, "%s", MSG_SGE_PTDISPATCHPROCTOJOBMALLOCFAILED));
- DEXIT;
- return 1;
- }
-diff -up GE2011.11p1/source/daemons/common/qmaster_heartbeat.c.format GE2011.11p1/source/daemons/common/qmaster_heartbeat.c
---- GE2011.11p1/source/daemons/common/qmaster_heartbeat.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/qmaster_heartbeat.c 2014-10-03 21:11:16.298851565 -0600
-@@ -65,7 +65,7 @@ int get_qmaster_heartbeat( char *file, i
- DENTER(TOP_LAYER, "get_qmaster_heartbeat");
-
- if (file == NULL) {
-- ERROR((SGE_EVENT, MSG_HEART_NO_FILENAME));
-+ ERROR((SGE_EVENT, "%s", MSG_HEART_NO_FILENAME));
- DEXIT;
- return -1;
- }
-@@ -138,7 +138,7 @@ int inc_qmaster_heartbeat(char *file, in
- DENTER(TOP_LAYER, "inc_qmaster_heartbeat");
-
- if (file == NULL) {
-- ERROR((SGE_EVENT, MSG_HEART_NO_FILENAME));
-+ ERROR((SGE_EVENT, "%s", MSG_HEART_NO_FILENAME));
- DEXIT;
- return -1;
- }
-diff -up GE2011.11p1/source/daemons/common/startprog.c.format GE2011.11p1/source/daemons/common/startprog.c
---- GE2011.11p1/source/daemons/common/startprog.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/startprog.c 2014-10-03 21:11:16.298851565 -0600
-@@ -210,7 +210,7 @@ pid_t pid
- else if (WIFSIGNALED(status))
- exit_status = 8;
- else {
-- ERROR((SGE_EVENT, MSG_PROC_WAITPIDRETURNEDUNKNOWNSTATUS));
-+ ERROR((SGE_EVENT, "%s", MSG_PROC_WAITPIDRETURNEDUNKNOWNSTATUS));
- exit_status = 8;
- }
-
-diff -up GE2011.11p1/source/daemons/common/unparse_job_cull.c.format GE2011.11p1/source/daemons/common/unparse_job_cull.c
---- GE2011.11p1/source/daemons/common/unparse_job_cull.c.format 2012-05-23 13:04:37.000000000 -0600
-+++ GE2011.11p1/source/daemons/common/unparse_job_cull.c 2014-10-03 21:11:16.299851588 -0600
-@@ -176,7 +176,7 @@ int flags
- ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, 0);
- if (ret) {
- DPRINTF(("Error %d formatting jid_request_list as -hold_jid\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJID);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJID);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -194,7 +194,7 @@ int flags
- ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, 0);
- if (ret) {
- DPRINTF(("Error %d formatting ja_ad_request_list as -hold_jid_ad\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJIDAD);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJIDPREDECESSORLISTASHOLDJIDAD);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -230,7 +230,7 @@ int flags
- 0);
- if (ret) {
- DPRINTF(("Error %d formatting job_identifier_list as -jid\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJOBIDENTIFIERLISTASJID);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJOBIDENTIFIERLISTASJID);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -277,7 +277,7 @@ int flags
- cp = sge_unparse_mail_options(ul);
- if (!cp) {
- DPRINTF(("Error unparsing mail options\n"));
-- sprintf(str, MSG_PARSE_ERRORUNPARSINGMAILOPTIONS);
-+ sprintf(str, "%s", MSG_PARSE_ERRORUNPARSINGMAILOPTIONS);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -318,7 +318,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting mail list as -M\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATTINGMAILLISTASM );
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATTINGMAILLISTASM );
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -363,13 +363,13 @@ int flags
-
- prty = ul - BASE_PRIORITY;
- if (prty > 1024) {
-- sprintf(str, MSG_PROC_INVALIDPROIRITYMUSTBELESSTHAN1025);
-+ sprintf(str, "%s", MSG_PROC_INVALIDPROIRITYMUSTBELESSTHAN1025);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DEXIT;
- return answer;
- }
- if (prty < -1023) {
-- sprintf(str, MSG_PROC_INVALIDPRIORITYMUSTBEGREATERTHANMINUS1024);
-+ sprintf(str, "%s", MSG_PROC_INVALIDPRIORITYMUSTBEGREATERTHANMINUS1024);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DEXIT;
- return answer;
-@@ -403,7 +403,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting hard_queue_list as -q\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGHARDQUEUELISTASQ);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGHARDQUEUELISTASQ);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -420,7 +420,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting soft_queue_list as -q\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGSOFTQUEUELISTASQ);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGSOFTQUEUELISTASQ);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -488,7 +488,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting environment list as -v\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGENVIRONMENTLISTASV);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGENVIRONMENTLISTASV);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -527,7 +527,7 @@ int flags
- FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting job arguments\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGJOBARGUMENTS);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGJOBARGUMENTS);
- answer_list_add(&answer, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return answer;
- }
-@@ -708,7 +708,7 @@ lList **alpp
- ret = centry_list_append_to_string(lp, str, sizeof(str) - 1);
- if (ret) {
- DPRINTF(("Error %d formatting hard_resource_list as -l\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGHARDRESOURCELISTASL);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGHARDRESOURCELISTASL);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return ret;
- }
-@@ -751,7 +751,7 @@ lList **alpp
- sge_dstring_append(&string_buffer, " ");
- if (!(lp = lGetList(job, JB_pe_range))) {
- DPRINTF(("Job has parallel environment with no ranges\n"));
-- sprintf(str, MSG_JOB_JOBHASPEWITHNORANGES);
-+ sprintf(str, "%s", MSG_JOB_JOBHASPEWITHNORANGES);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- sge_dstring_free(&string_buffer);
- DEXIT;
-@@ -767,7 +767,7 @@ lList **alpp
- }
- if (ret) {
- DPRINTF(("Error %d formatting ranges in -pe\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGRANGESINPE);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGRANGESINPE);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- sge_dstring_free(&string_buffer);
- DEXIT;
-@@ -805,7 +805,7 @@ lList **alpp
- ret = uni_print_list(NULL, str, sizeof(str) - 1, lp, fields, delis, FLG_NO_DELIS_STRINGS);
- if (ret) {
- DPRINTF(("Error %d formatting path_list\n", ret));
-- sprintf(str, MSG_LIST_ERRORFORMATINGPATHLIST);
-+ sprintf(str, "%s", MSG_LIST_ERRORFORMATINGPATHLIST);
- answer_list_add(alpp, str, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- return ret;
- }
-diff -up GE2011.11p1/source/daemons/execd/dispatcher.c.format GE2011.11p1/source/daemons/execd/dispatcher.c
---- GE2011.11p1/source/daemons/execd/dispatcher.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/dispatcher.c 2014-10-03 21:11:16.299851588 -0600
-@@ -247,7 +247,7 @@ int sge_execd_process_messages(sge_gdi_c
- */
- sge_set_qmrestart_time(now);
- sge_set_delay_job_reports_flag(true);
-- INFO((SGE_EVENT, MSG_EXECD_ENABLEDELEAYDJOBREPORTING));
-+ INFO((SGE_EVENT, "%s", MSG_EXECD_ENABLEDELEAYDJOBREPORTING));
-
- /* after a reconnect, we want to send a full load report - immediately */
- execd_trash_load_report();
-@@ -272,7 +272,7 @@ int sge_execd_process_messages(sge_gdi_c
- if (sge_get_delay_job_reports_flag() && (now - sge_get_qmrestart_time() >= DELAYED_FINISHED_JOB_REPORTING_INTERVAL)) {
- sge_set_delay_job_reports_flag(false);
- sge_set_qmrestart_time(0);
-- INFO((SGE_EVENT, MSG_EXECD_DISABLEDELEAYDJOBREPORTING));
-+ INFO((SGE_EVENT, "%s", MSG_EXECD_DISABLEDELEAYDJOBREPORTING));
- }
-
- if (now - last_alive_check >= alive_check_interval) {
-diff -up GE2011.11p1/source/daemons/execd/execd.c.format GE2011.11p1/source/daemons/execd/execd.c
---- GE2011.11p1/source/daemons/execd/execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/execd.c 2014-10-03 21:11:16.299851588 -0600
-@@ -237,7 +237,7 @@ int main(int argc, char **argv)
- if (printed_points != 0) {
- printf("\n");
- }
-- CRITICAL((SGE_EVENT, MSG_COM_ERROR));
-+ CRITICAL((SGE_EVENT, "%s", MSG_COM_ERROR));
- SGE_EXIT((void**)&ctx, 1);
- }
- if (cl_com_get_handle(prognames[EXECD],1) == NULL) {
-@@ -262,7 +262,7 @@ int main(int argc, char **argv)
- */
- ret_val = cl_com_set_status_func(sge_execd_application_status);
- if (ret_val != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(ret_val)) );
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val)) );
- }
-
- /* test connection */
-@@ -272,8 +272,8 @@ int main(int argc, char **argv)
- (char *)ctx->get_master(ctx, true),
- (char*)prognames[QMASTER], 1, &status);
- if (ret_val != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(ret_val)));
-- ERROR((SGE_EVENT, MSG_CONF_NOCONFBG));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val)));
-+ ERROR((SGE_EVENT, "%s", MSG_CONF_NOCONFBG));
- }
- cl_com_free_sirm_message(&status);
- }
-@@ -339,15 +339,15 @@ int main(int argc, char **argv)
- * Log a warning message if execd hasn't been started by a superuser
- */
- if (!sge_is_start_user_superuser()) {
-- WARNING((SGE_EVENT, MSG_SWITCH_USER_NOT_ROOT));
-+ WARNING((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_ROOT));
- }
-
- #ifdef COMPILE_DC
- if (ptf_init()) {
-- CRITICAL((SGE_EVENT, MSG_EXECD_NOSTARTPTF));
-+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_NOSTARTPTF));
- SGE_EXIT((void**)&ctx, 1);
- }
-- INFO((SGE_EVENT, MSG_EXECD_STARTPDCANDPTF));
-+ INFO((SGE_EVENT, "%s", MSG_EXECD_STARTPDCANDPTF));
- #endif
-
- master_job_list = object_type_get_master_list(SGE_TYPE_JOB);
-@@ -650,7 +650,7 @@ static lList *sge_parse_execd(lList **pp
- }
-
- if(lGetNumberOfElem(*ppcmdline)) {
-- sprintf(str, MSG_PARSE_TOOMANYARGS);
-+ sprintf(str, "%s", MSG_PARSE_TOOMANYARGS);
- if(!usageshowed)
- sge_usage(EXECD, stderr);
- answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
-diff -up GE2011.11p1/source/daemons/execd/execd_job_exec.c.format GE2011.11p1/source/daemons/execd/execd_job_exec.c
---- GE2011.11p1/source/daemons/execd/execd_job_exec.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/execd_job_exec.c 2014-10-03 21:11:16.300851612 -0600
-@@ -97,7 +97,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx
- /* ------- featureset */
- if (unpackint(&(aMsg->buf), &feature_set))
- {
-- ERROR((SGE_EVENT, MSG_COM_UNPACKFEATURESET));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKFEATURESET));
- DRETURN(0);
- }
-
-@@ -117,7 +117,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx
-
- if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &job, JB_Type)) {
- answer_list_output(&answer_list);
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
-
-@@ -161,7 +161,7 @@ int do_job_exec(sge_gdi_ctx_class_t *ctx
-
- if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &petrep, PETR_Type)) {
- answer_list_output(&answer_list);
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
-
-@@ -198,7 +198,7 @@ int do_job_slave(sge_gdi_ctx_class_t *ct
-
- /* ------- featureset */
- if (unpackint(&(aMsg->buf), &feature_set)) {
-- ERROR((SGE_EVENT, MSG_COM_UNPACKFEATURESET));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKFEATURESET));
- DRETURN(0);
- }
-
-@@ -211,7 +211,7 @@ int do_job_slave(sge_gdi_ctx_class_t *ct
- /* ------- job */
- if (!object_unpack_elem_verify(&answer_list, &(aMsg->buf), &jelem, JB_Type)) {
- answer_list_output(&answer_list);
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
- lFreeList(&answer_list);
-diff -up GE2011.11p1/source/daemons/execd/execd_ticket.c.format GE2011.11p1/source/daemons/execd/execd_ticket.c
---- GE2011.11p1/source/daemons/execd/execd_ticket.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/execd_ticket.c 2014-10-03 21:11:16.300851612 -0600
-@@ -66,7 +66,7 @@ int do_ticket(sge_gdi_ctx_class_t *ctx,
-
- if (unpackint(&(aMsg->buf), &jobid) || unpackint(&(aMsg->buf), &jataskid)
- || unpackdouble(&(aMsg->buf), &ticket)) {
-- ERROR((SGE_EVENT, MSG_JOB_TICKETFORMAT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_TICKETFORMAT));
- DRETURN(0);
- }
- DPRINTF(("got %lf new tickets for job "sge_u32"."sge_u32"\n", ticket, jobid, jataskid));
-diff -up GE2011.11p1/source/daemons/execd/exec_job.c.format GE2011.11p1/source/daemons/execd/exec_job.c
---- GE2011.11p1/source/daemons/execd/exec_job.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/exec_job.c 2014-10-03 21:11:16.301851635 -0600
-@@ -404,14 +404,14 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- if (!(used_slots=qinstance_slots_used(master_q))) {
- if (!(sge_make_tmpdir(master_q, job_id, ja_task_id,
- pw->pw_uid, pw->pw_gid, tmpdir))) {
-- snprintf(err_str, err_length, MSG_SYSTEM_CANTMAKETMPDIR);
-+ snprintf(err_str, err_length, "%s", MSG_SYSTEM_CANTMAKETMPDIR);
- DEXIT;
- return -2;
- }
- } else {
- SGE_STRUCT_STAT statbuf;
- if(!(sge_get_tmpdir(master_q, job_id, ja_task_id, tmpdir))) {
-- snprintf(err_str, err_length, MSG_SYSTEM_CANTGETTMPDIR);
-+ snprintf(err_str, err_length, "%s", MSG_SYSTEM_CANTGETTMPDIR);
- DEXIT;
- return -2;
- }
-@@ -1037,7 +1037,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- FREE(gid_range);
- if (rlp == NULL) {
- lFreeList(&alp);
-- snprintf(err_str, err_length, MSG_EXECD_NOPARSEGIDRANGE);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOPARSEGIDRANGE);
- lFreeList(&environmentList);
- FCLOSE(fp);
- DEXIT;
-@@ -1050,7 +1050,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- while (addgrpid_already_in_use(last_addgrpid)) {
- last_addgrpid = get_next_addgrpid (rlp, last_addgrpid);
- if (temp_id == last_addgrpid) {
-- snprintf(err_str, err_length, MSG_EXECD_NOADDGID);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOADDGID);
- lFreeList(&environmentList);
- FCLOSE(fp);
- DEXIT;
-@@ -1426,7 +1426,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- fprintf(fp, "exec_file=%s\n", xterm);
- DPRINTF(("exec_file=%s\n", xterm));
- } else {
-- snprintf(err_str, err_length, MSG_EXECD_NOXTERM);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_NOXTERM);
- FCLOSE(fp);
- lFreeList(&environmentList);
- sge_dstring_free(&core_binding_strategy_string);
-@@ -1498,7 +1498,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- */
- const char *error_string = lGetString(lFirst(answer_list), AN_text);
- if(error_string != NULL) {
-- snprintf(err_str, err_length, error_string);
-+ snprintf(err_str, err_length, "%s", error_string);
- }
- lFreeList(&answer_list);
- lFreeList(&environmentList);
-@@ -1747,7 +1747,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- set_token_cmd = mconf_get_set_token_cmd();
- if (!set_token_cmd ||
- !strlen(set_token_cmd) || !mconf_get_token_extend_time()) {
-- snprintf(err_str, err_length, MSG_EXECD_AFSCONFINCOMPLETE);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_AFSCONFINCOMPLETE);
- FREE(pag_cmd);
- FREE(shepherd_cmd);
- DEXIT;
-@@ -1767,7 +1767,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
-
- cp = lGetString(jep, JB_tgt);
- if (!cp || !(len = strlen(cp))) {
-- snprintf(err_str, err_length, MSG_EXECD_TOKENZERO);
-+ snprintf(err_str, err_length, "%s", MSG_EXECD_TOKENZERO);
- FREE(pag_cmd);
- FREE(shepherd_cmd);
- DEXIT;
-@@ -1990,7 +1990,7 @@ int sge_exec_job(sge_gdi_ctx_class_t *ct
- }
-
- FCLOSE_ERROR:
-- CRITICAL((SGE_EVENT, MSG_EXECD_NOSTARTSHEPHERD));
-+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_NOSTARTSHEPHERD));
-
- exit(1);
-
-diff -up GE2011.11p1/source/daemons/execd/job_report_execd.c.format GE2011.11p1/source/daemons/execd/job_report_execd.c
---- GE2011.11p1/source/daemons/execd/job_report_execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/job_report_execd.c 2014-10-03 21:11:16.301851635 -0600
-@@ -103,7 +103,7 @@ lListElem *add_job_report(u_long32 jobid
- jr_list = lCreateList("job report list", JR_Type);
-
- if (jr_list == NULL || (jr=lCreateElem(JR_Type)) == NULL) {
-- ERROR((SGE_EVENT, MSG_JOB_TYPEMALLOC));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_TYPEMALLOC));
- DRETURN(NULL);
- }
-
-@@ -278,7 +278,7 @@ int do_ack(sge_gdi_ctx_class_t *ctx, str
- while (pb_unused(&(aMsg->buf)) > 0) {
-
- if (cull_unpack_elem(&(aMsg->buf), &ack, NULL)) {
-- ERROR((SGE_EVENT, MSG_COM_UNPACKJOB));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_UNPACKJOB));
- DRETURN(0);
- }
-
-@@ -355,7 +355,7 @@ int do_ack(sge_gdi_ctx_class_t *ctx, str
- break;
-
- default:
-- ERROR((SGE_EVENT, MSG_COM_ACK_UNKNOWN1));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_ACK_UNKNOWN1));
- break;
- }
-
-diff -up GE2011.11p1/source/daemons/execd/load_avg.c.format GE2011.11p1/source/daemons/execd/load_avg.c
---- GE2011.11p1/source/daemons/execd/load_avg.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/load_avg.c 2014-10-03 21:11:16.302851658 -0600
-@@ -719,7 +719,7 @@ static int sge_get_loadavg(const char* q
-
- now = sge_get_gmt();
- if (now >= next_log) {
-- WARNING((SGE_EVENT, MSG_SGETEXT_NO_LOAD));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_NO_LOAD));
- next_log = now + 7200;
- }
- } else if (loads == -2) {
-@@ -774,7 +774,7 @@ static int sge_get_loadavg(const char* q
- if (sge_loadmem(&mem_info)) {
- static int mem_fail = 0;
- if (!mem_fail) {
-- ERROR((SGE_EVENT, MSG_LOAD_NOMEMINDICES));
-+ ERROR((SGE_EVENT, "%s", MSG_LOAD_NOMEMINDICES));
- mem_fail =1;
- }
- DRETURN(1);
-@@ -916,7 +916,7 @@ static int sge_get_loadavg(const char* q
-
- u_long32 now = sge_get_gmt();
- if (now >= next_log2) {
-- WARNING((SGE_EVENT, MSG_SGETEXT_NO_LOAD));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_NO_LOAD));
- next_log2 = now + 7200;
- }
- }
-diff -up GE2011.11p1/source/daemons/execd/ptf.c.format GE2011.11p1/source/daemons/execd/ptf.c
---- GE2011.11p1/source/daemons/execd/ptf.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/ptf.c 2014-10-03 21:11:16.302851658 -0600
-@@ -825,7 +825,7 @@ static lListElem *ptf_get_job_os(lList *
- #endif
-
- if (!where) {
-- CRITICAL((SGE_EVENT, MSG_WHERE_FAILEDTOBUILDWHERECONDITION));
-+ CRITICAL((SGE_EVENT, "%s", MSG_WHERE_FAILEDTOBUILDWHERECONDITION));
- DRETURN(NULL);
- }
-
-diff -up GE2011.11p1/source/daemons/execd/reaper_execd.c.format GE2011.11p1/source/daemons/execd/reaper_execd.c
---- GE2011.11p1/source/daemons/execd/reaper_execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/reaper_execd.c 2014-10-03 21:11:16.303851682 -0600
-@@ -420,7 +420,7 @@ static int clean_up_job(lListElem *jr, i
- sge_dstring_init(&id_dstring, id_buffer, MAX_STRING_SIZE);
-
- if (!jr) {
-- CRITICAL((SGE_EVENT, MSG_JOB_CLEANUPJOBCALLEDWITHINVALIDPARAMETERS));
-+ CRITICAL((SGE_EVENT, "%s", MSG_JOB_CLEANUPJOBCALLEDWITHINVALIDPARAMETERS));
- DEXIT;
- return -1;
- }
-@@ -511,7 +511,7 @@ static int clean_up_job(lListElem *jr, i
-
- sprintf(error, MSG_STATUS_ABNORMALTERMINATIONOFSHEPHERDFORJOBXY_S,
- job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
-- ERROR((SGE_EVENT, error));
-+ ERROR((SGE_EVENT, "%s", error));
-
- /*
- * failed = ESSTATE_SHEPHERD_EXIT or exit status of shepherd if we are
-@@ -525,7 +525,7 @@ static int clean_up_job(lListElem *jr, i
- if (fscanf_count != 1) {
- sprintf(error, MSG_STATUS_ABNORMALTERMINATIONFOSHEPHERDFORJOBXYEXITSTATEFILEISEMPTY_S,
- job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
-- ERROR((SGE_EVENT, error));
-+ ERROR((SGE_EVENT, "%s", error));
- /*
- * If shepherd died through signal assume job was started, else
- * trust exit status
-@@ -553,9 +553,9 @@ static int clean_up_job(lListElem *jr, i
-
- if (failed) {
- if (failed == ESSTATE_DIED_THRU_SIGNAL)
-- sprintf(error, MSG_SHEPHERD_DIEDTHROUGHSIGNAL);
-+ sprintf(error, "%s", MSG_SHEPHERD_DIEDTHROUGHSIGNAL);
- else if (failed == ESSTATE_NO_PID)
-- sprintf(error, MSG_SHEPHERD_NOPIDFILE);
-+ sprintf(error, "%s", MSG_SHEPHERD_NOPIDFILE);
- else
- sprintf(error, MSG_SHEPHERD_EXITEDWISSTATUS_IS, failed,
- get_sstate_description(failed));
-@@ -605,7 +605,7 @@ static int clean_up_job(lListElem *jr, i
- job_get_id_string(job_id, ja_task_id, pe_task_id, &id_dstring));
- }
-
-- ERROR((SGE_EVENT, error));
-+ ERROR((SGE_EVENT, "%s", error));
-
- if (!failed) {
- failed = SSTATE_FAILURE_AFTER_JOB;
-@@ -640,7 +640,7 @@ static int clean_up_job(lListElem *jr, i
- if (!failed) {
- failed = SSTATE_FAILURE_AFTER_JOB;
- if (!*error)
-- sprintf(error, MSG_JOB_CANTREADUSEDRESOURCESFORJOB);
-+ sprintf(error, "%s", MSG_JOB_CANTREADUSEDRESOURCESFORJOB);
- }
- }
- }
-@@ -1218,7 +1218,7 @@ int clean_up_old_jobs(sge_gdi_ctx_class_
- DENTER(TOP_LAYER, "clean_up_old_jobs");
-
- if (startup) {
-- INFO((SGE_EVENT, MSG_SHEPHERD_CKECKINGFOROLDJOBS));
-+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_CKECKINGFOROLDJOBS));
- }
-
- /*
-@@ -1243,9 +1243,9 @@ int clean_up_old_jobs(sge_gdi_ctx_class_
- !lost_children) {
- if (lost_children) {
- if (startup) {
-- INFO((SGE_EVENT, MSG_SHEPHERD_NOOLDJOBSATSTARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_NOOLDJOBSATSTARTUP));
- } else {
-- INFO((SGE_EVENT, MSG_SHEPHERD_NOMOREOLDJOBSAFTERSTARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_SHEPHERD_NOMOREOLDJOBSAFTERSTARTUP));
- }
- /*
- * Now setting lost_children to 0 which disables further pid checking
-@@ -1261,7 +1261,7 @@ int clean_up_old_jobs(sge_gdi_ctx_class_
- /* Get pids of running jobs. So we can look for running shepherds. */
- npids = sge_get_pids(pids, 10000, SGE_SHEPHERD, PSCMD);
- if (npids == -1) {
-- ERROR((SGE_EVENT, MSG_SHEPHERD_CANTGETPROCESSESFROMPSCOMMAND));
-+ ERROR((SGE_EVENT, "%s", MSG_SHEPHERD_CANTGETPROCESSESFROMPSCOMMAND));
- DEXIT;
- return -1;
- }
-@@ -1451,7 +1451,7 @@ examine_job_task_from_file(sge_gdi_ctx_c
-
- if (startup)
- {
-- INFO((SGE_EVENT, err_str));
-+ INFO((SGE_EVENT, "%s", err_str));
- modify_queue_limits_flag_for_job(ctx->get_qualified_hostname(ctx), jep, true);
- }
- else
-diff -up GE2011.11p1/source/daemons/execd/setup_execd.c.format GE2011.11p1/source/daemons/execd/setup_execd.c
---- GE2011.11p1/source/daemons/execd/setup_execd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/execd/setup_execd.c 2014-10-03 21:11:16.303851682 -0600
-@@ -88,20 +88,20 @@ void sge_setup_sge_execd(sge_gdi_ctx_cla
- ** switch to admin user
- */
- if (sge_set_admin_username(admin_user, err_str)) {
-- CRITICAL((SGE_EVENT, err_str));
-+ CRITICAL((SGE_EVENT, "%s", err_str));
- /* TODO: remove */
- SGE_EXIT(NULL, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER));
- /* TODO: remove */
- SGE_EXIT(NULL, 1);
- }
-
- while (gdi2_wait_for_conf(ctx, &Execd_Config_List)) {
- if (allowed_get_conf_errors-- <= 0) {
-- CRITICAL((SGE_EVENT, MSG_EXECD_CANT_GET_CONFIGURATION_EXIT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_EXECD_CANT_GET_CONFIGURATION_EXIT));
- /* TODO: remove */
- SGE_EXIT(NULL, 1);
- }
-diff -up GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c.format GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/configuration_qmaster.c 2014-10-03 21:11:16.304851705 -0600
-@@ -167,7 +167,7 @@ int sge_read_configuration(sge_gdi_ctx_c
- }
-
- if ((global = sge_get_configuration_for_host(SGE_GLOBAL_NAME)) == NULL) {
-- ERROR((SGE_EVENT, MSG_CONFIG_NOGLOBAL));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_NOGLOBAL));
- DRETURN(-1);
- }
-
-@@ -371,7 +371,7 @@ int sge_mod_configuration(sge_gdi_ctx_cl
- }
-
- if ((global = sge_get_configuration_for_host(SGE_GLOBAL_NAME)) == NULL) {
-- ERROR((SGE_EVENT, MSG_CONFIG_NOGLOBAL));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_NOGLOBAL));
- }
-
- if (merge_configuration(&answer_list, progid, cell_root, global, local, NULL) != 0) {
-diff -up GE2011.11p1/source/daemons/qmaster/job_exit.c.format GE2011.11p1/source/daemons/qmaster/job_exit.c
---- GE2011.11p1/source/daemons/qmaster/job_exit.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/job_exit.c 2014-10-03 21:11:16.304851705 -0600
-@@ -326,7 +326,7 @@ void sge_job_exit(sge_gdi_ctx_class_t *c
-
- sge_dstring_sprintf(&error, MSG_LOG_QERRORBYJOBHOST_SUS, lGetString(qinstance, QU_qname), sge_u32c(jobid), host);
- qinstance_message_add(qinstance, QI_ERROR, sge_dstring_get_string(&error));
-- ERROR((SGE_EVENT, sge_dstring_get_string(&error)));
-+ ERROR((SGE_EVENT, "%s", sge_dstring_get_string(&error)));
- sge_event_spool(ctx, &answer_list, 0, sgeE_QINSTANCE_MOD,
- 0, 0, lGetString(qinstance, QU_qname),
- lGetHost(qinstance, QU_qhostname), NULL,
-@@ -350,7 +350,7 @@ void sge_job_exit(sge_gdi_ctx_class_t *c
- /* general error -> this queue cant run any job */
- sge_qmaster_qinstance_state_set_error(queueep, true);
- qinstance_message_add(queueep, QI_ERROR, sge_dstring_get_string(&error));
-- ERROR((SGE_EVENT, sge_dstring_get_string(&error)));
-+ ERROR((SGE_EVENT, "%s", sge_dstring_get_string(&error)));
- sge_event_spool(ctx, &answer_list, 0, sgeE_QINSTANCE_MOD,
- 0, 0, lGetString(queueep, QU_qname),
- lGetHost(queueep, QU_qhostname), NULL,
-diff -up GE2011.11p1/source/daemons/qmaster/reschedule.c.format GE2011.11p1/source/daemons/qmaster/reschedule.c
---- GE2011.11p1/source/daemons/qmaster/reschedule.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/reschedule.c 2014-10-03 21:11:16.304851705 -0600
-@@ -333,10 +333,10 @@ int reschedule_job(sge_gdi_ctx_class_t *
- if (job_is_array(jep)) {
- sprintf(mail_ids, sge_U32CFormat"."sge_U32CFormat,
- sge_u32c(job_number), sge_u32c(task_number));
-- sprintf(mail_type, MSG_RU_TYPEJOBARRAY);
-+ sprintf(mail_type, "%s", MSG_RU_TYPEJOBARRAY);
- } else {
- sprintf(mail_ids, sge_U32CFormat, sge_u32c(job_number));
-- sprintf(mail_type, MSG_RU_TYPEJOB);
-+ sprintf(mail_type, "%s", MSG_RU_TYPEJOB);
- }
-
- granted_qs = lGetList(this_jatep, JAT_granted_destin_identifier_list);
-@@ -531,9 +531,9 @@ int reschedule_job(sge_gdi_ctx_class_t *
-
- mail_options = lGetUlong(jep, JB_mail_options);
- if (force) {
-- sprintf(mail_action, MSG_RU_FORCEDR);
-+ sprintf(mail_action, "%s", MSG_RU_FORCEDR);
- } else {
-- sprintf(mail_action, MSG_RU_PUSHEDR);
-+ sprintf(mail_action, "%s", MSG_RU_PUSHEDR);
- }
- if (VALID(MAIL_AT_ABORT, mail_options)) {
- lList *mail_users;
-diff -up GE2011.11p1/source/daemons/qmaster/setup_qmaster.c.format GE2011.11p1/source/daemons/qmaster/setup_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/setup_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/setup_qmaster.c 2014-10-03 21:11:16.305851728 -0600
-@@ -179,7 +179,7 @@ int sge_setup_qmaster(sge_gdi_ctx_class_
-
- process_cmdline(anArgv);
-
-- INFO((SGE_EVENT, MSG_STARTUP_BEGINWITHSTARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_STARTUP_BEGINWITHSTARTUP));
-
- qmaster_unlock(QMASTER_LOCK_FILE);
-
-@@ -245,12 +245,12 @@ sge_qmaster_thread_init(sge_gdi_ctx_clas
- if (switch_to_admin_user == true) {
- char str[1024];
- if (sge_set_admin_username(admin_user, str) == -1) {
-- CRITICAL((SGE_EVENT, str));
-+ CRITICAL((SGE_EVENT, "%s", str));
- SGE_EXIT((void**)ctx_ref, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER));
- SGE_EXIT((void**)ctx_ref, 1);
- }
- }
-@@ -520,7 +520,7 @@ static lList *parse_qmaster(lList **ppcm
- }
-
- if(lGetNumberOfElem(*ppcmdline)) {
-- sprintf(str, MSG_PARSE_TOOMANYOPTIONS);
-+ sprintf(str, "%s", MSG_PARSE_TOOMANYOPTIONS);
- if(!usageshowed)
- sge_usage(QMASTER, stderr);
- answer_list_add(&alp, str, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
-@@ -557,7 +557,7 @@ static void qmaster_init(sge_gdi_ctx_cla
- DENTER(TOP_LAYER, "qmaster_init");
-
- if (setup_qmaster(ctx)) {
-- CRITICAL((SGE_EVENT, MSG_STARTUP_SETUPFAILED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_STARTUP_SETUPFAILED));
- SGE_EXIT(NULL, 1);
- }
-
-@@ -809,7 +809,7 @@ static void qmaster_lock_and_shutdown(vo
-
- if (anExitValue == 0) {
- if (qmaster_lock(QMASTER_LOCK_FILE) == -1) {
-- CRITICAL((SGE_EVENT, MSG_QMASTER_LOCKFILE_ALREADY_EXISTS));
-+ CRITICAL((SGE_EVENT, "%s", MSG_QMASTER_LOCKFILE_ALREADY_EXISTS));
- }
- }
- sge_gdi2_shutdown(ctx_ref);
-@@ -837,7 +837,7 @@ static int setup_qmaster(sge_gdi_ctx_cla
- if (first) {
- first = false;
- } else {
-- CRITICAL((SGE_EVENT, MSG_SETUP_SETUPMAYBECALLEDONLYATSTARTUP));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SETUP_SETUPMAYBECALLEDONLYATSTARTUP));
- DEXIT;
- return -1;
- }
-@@ -942,14 +942,14 @@ static int setup_qmaster(sge_gdi_ctx_cla
- if (!host_list_locate(*object_base[SGE_TYPE_EXECHOST].list, SGE_TEMPLATE_NAME)) {
- /* add an exec host "template" */
- if (sge_add_host_of_type(ctx, SGE_TEMPLATE_NAME, SGE_EH_LIST, &monitor))
-- ERROR((SGE_EVENT, MSG_CONFIG_ADDINGHOSTTEMPLATETOEXECHOSTLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_ADDINGHOSTTEMPLATETOEXECHOSTLIST));
- }
-
- /* add host "global" to Master_Exechost_List as an exec host */
- if (!host_list_locate(*object_base[SGE_TYPE_EXECHOST].list, SGE_GLOBAL_NAME)) {
- /* add an exec host "global" */
- if (sge_add_host_of_type(ctx, SGE_GLOBAL_NAME, SGE_EH_LIST, &monitor))
-- ERROR((SGE_EVENT, MSG_CONFIG_ADDINGHOSTGLOBALTOEXECHOSTLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_CONFIG_ADDINGHOSTGLOBALTOEXECHOSTLIST));
- }
-
- /* add qmaster host to Master_Adminhost_List as an administrativ host */
-@@ -967,7 +967,7 @@ static int setup_qmaster(sge_gdi_ctx_cla
-
- if (!spool_write_object(&answer_list, spooling_context, ep, "root", SGE_TYPE_MANAGER, job_spooling)) {
- answer_list_output(&answer_list);
-- CRITICAL((SGE_EVENT, MSG_CONFIG_CANTWRITEMANAGERLIST));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CONFIG_CANTWRITEMANAGERLIST));
- DRETURN(-1);
- }
- }
-@@ -987,7 +987,7 @@ static int setup_qmaster(sge_gdi_ctx_cla
-
- if (!spool_write_object(&answer_list, spooling_context, ep, "root", SGE_TYPE_OPERATOR, job_spooling)) {
- answer_list_output(&answer_list);
-- CRITICAL((SGE_EVENT, MSG_CONFIG_CANTWRITEOPERATORLIST));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CONFIG_CANTWRITEOPERATORLIST));
- DEXIT;
- return -1;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c.format GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c
---- GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_c_gdi.c 2014-10-03 21:11:16.306851752 -0600
-@@ -320,7 +320,7 @@ sge_c_gdi(sge_gdi_ctx_class_t *ctx, sge_
- sge_gdi_packet_pack_task(packet, task, answer_list, pb);
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_UNKNOWNOP));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_UNKNOWNOP));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP,
- ANSWER_QUALITY_ERROR);
- sge_gdi_packet_pack_task(packet, task, answer_list, pb);
-@@ -357,7 +357,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- case SGE_EV_LIST:
- task->data_list = sge_select_event_clients("", task->condition, task->enumeration);
- task->do_select_pack_simultaneous = false;
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- DEXIT;
- return;
-@@ -371,7 +371,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
-
- task->data_list = lSelectHashPack("", conf, task->condition, task->enumeration, false, NULL);
- task->do_select_pack_simultaneous = false;
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- lFreeList(&conf);
- }
-@@ -386,7 +386,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- conf = sconf_get_config_list();
- task->data_list = lSelectHashPack("", conf, task->condition, task->enumeration, false, NULL);
- task->do_select_pack_simultaneous = false;
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- lFreeList(&conf);
- }
-@@ -404,7 +404,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- answer_list_add(&(task->answer_list),MSG_SGETEXT_JOBINFOMESSAGESOUTDATED,
- STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- } else if (ao == NULL || ao->list_type == SGE_TYPE_NONE) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- } else {
- lList *data_source = *object_type_get_master_list(ao->list_type);
-@@ -420,7 +420,7 @@ sge_c_gdi_get(gdi_object_t *ao, sge_gdi_
- * 05/21/2007 qualitiy was ANSWER_QUALITY_INFO but this results in "ok"
- * messages on qconf side
- */
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
-
- } else {
-@@ -567,7 +567,7 @@ sge_c_gdi_add(sge_gdi_ctx_class_t *ctx,
-
- default:
- if (!ao) {
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -656,7 +656,7 @@ sge_c_gdi_del(sge_gdi_ctx_class_t *ctx,
- packet->user, packet->host);
- break;
- default:
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -733,7 +733,7 @@ sge_c_gdi_del(sge_gdi_ctx_class_t *ctx,
- ar_del(ctx, ep, &(task->answer_list), object_base[SGE_TYPE_AR].list, packet->user, packet->host, monitor);
- break;
- default:
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- } /* switch target */
-@@ -788,7 +788,7 @@ static void sge_c_gdi_copy(sge_gdi_ctx_c
- break;
-
- default:
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -876,7 +876,7 @@ static void sge_gdi_do_permcheck(sge_gdi
- }
- }
-
-- sprintf(SGE_EVENT, MSG_GDI_OKNL);
-+ sprintf(SGE_EVENT, "%s", MSG_GDI_OKNL);
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_END);
- DEXIT;
- return;
-@@ -895,7 +895,7 @@ sge_c_gdi_permcheck(sge_gdi_packet_class
- sge_gdi_do_permcheck(packet, task);
- break;
- default:
-- WARNING((SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- }
- DRETURN_VOID;
-@@ -941,7 +941,7 @@ void sge_c_gdi_replace(sge_gdi_ctx_class
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -1000,7 +1000,7 @@ sge_c_gdi_trigger(sge_gdi_ctx_class_t *c
- default:
- /* permissions should be checked in the functions. Here we don't
- know what is to do, so we don't know what permissions we need */
-- WARNING((SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ WARNING((SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -1231,13 +1231,13 @@ trigger_scheduler_monitoring(sge_gdi_pac
- DENTER(GDI_LAYER, "trigger_scheduler_monitoring");
-
- if (!manop_is_manager(packet->user)) {
-- WARNING((SGE_EVENT, MSG_COM_NOSCHEDMONPERMS));
-+ WARNING((SGE_EVENT, "%s", MSG_COM_NOSCHEDMONPERMS));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_WARNING);
- DEXIT;
- return;
- }
- if (!sge_add_event_for_client(EV_ID_SCHEDD, 0, sgeE_SCHEDDMONITOR, 0, 0, NULL, NULL, NULL, NULL)) {
-- WARNING((SGE_EVENT, MSG_COM_NOSCHEDDREGMASTER));
-+ WARNING((SGE_EVENT, "%s", MSG_COM_NOSCHEDDREGMASTER));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_WARNING);
- DEXIT;
- return;
-@@ -1311,7 +1311,7 @@ static void sge_c_gdi_mod(sge_gdi_ctx_cl
- break;
- default:
- if (ao == NULL) {
-- SGE_ADD_MSG_ID( sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID( sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- break;
- }
-@@ -1422,7 +1422,7 @@ static int sge_chck_mod_perm_user(lList
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(alpp, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- DRETURN(1);
- }
-@@ -1526,7 +1526,7 @@ int sge_chck_mod_perm_host(lList **alpp,
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(alpp, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- DRETURN(1);
- }
-@@ -1595,7 +1595,7 @@ sge_task_check_get_perm_host(sge_gdi_pac
- }
- break;
- default:
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_SGETEXT_OPNOIMPFORTARGET));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_SGETEXT_OPNOIMPFORTARGET));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- ret = false;
- return ret;
-@@ -1711,7 +1711,7 @@ monitoring_t *monitor
- if (!(new_obj = (add
- ? lCreateElem(object->type)
- : lCopyElem(old_obj)))) {
-- ERROR((SGE_EVENT, MSG_MEM_MALLOC));
-+ ERROR((SGE_EVENT, "%s", MSG_MEM_MALLOC));
- answer_list_add(alpp, SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EEXIST);
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_cqueue_qmaster.c 2014-10-03 21:11:16.306851752 -0600
-@@ -640,7 +640,7 @@ int cqueue_mod(sge_gdi_ctx_class_t *ctx,
- const char *old_name = lGetString(cqueue, CQ_name);
-
- if (strcmp(old_name, name)) {
-- ERROR((SGE_EVENT, MSG_CQUEUE_NONAMECHANGE));
-+ ERROR((SGE_EVENT, "%s", MSG_CQUEUE_NONAMECHANGE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
- ret = false;
-@@ -932,7 +932,7 @@ int cqueue_del(sge_gdi_ctx_class_t *ctx,
- */
- for_each(qinstance, qinstances) {
- if (qinstance_slots_used(qinstance) > 0 || qinstance_slots_reserved(qinstance) > 0) {
-- ERROR((SGE_EVENT, MSG_QINSTANCE_STILLJOBS));
-+ ERROR((SGE_EVENT, "%s", MSG_QINSTANCE_STILLJOBS));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EEXIST,
- ANSWER_QUALITY_ERROR);
- do_del = false;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_follow.c.format GE2011.11p1/source/daemons/qmaster/sge_follow.c
---- GE2011.11p1/source/daemons/qmaster/sge_follow.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_follow.c 2014-10-03 21:11:16.307851775 -0600
-@@ -196,7 +196,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if (!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(-2);
- }
-@@ -305,7 +305,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
- * find and check queue
- */
- if (!q_name) {
-- ERROR((SGE_EVENT, MSG_OBJ_NOQNAME));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJ_NOQNAME));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- lFreeList(&gdil);
- lSetString(jatp, JAT_granted_pe, NULL);
-@@ -534,7 +534,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number = lGetUlong(ep, OR_job_number);
- if (job_number == 0) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(-2);
- }
-@@ -639,7 +639,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if (!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(-2);
- }
-@@ -759,7 +759,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if(!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DEXIT;
- return -2;
-@@ -961,7 +961,7 @@ sge_follow_order(sge_gdi_ctx_class_t *ct
-
- job_number=lGetUlong(ep, OR_job_number);
- if(!job_number) {
-- ERROR((SGE_EVENT, MSG_JOB_NOJOBID));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOJOBID));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DEXIT;
- return -2;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_hgroup_qmaster.c 2014-10-03 21:11:16.307851775 -0600
-@@ -256,7 +256,7 @@ hgroup_mod(sge_gdi_ctx_class_t *ctx,
- } else {
- lListElem *aep;
- for_each(aep, *answer_list) {
-- ERROR((SGE_EVENT, lGetString(aep, AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(aep, AN_text)));
- }
- ret = false;
- }
-@@ -266,7 +266,7 @@ hgroup_mod(sge_gdi_ctx_class_t *ctx,
-
- /* Reject modify requests which try to change the groupname */
- if (sge_hostcmp(old_name, name)) {
-- ERROR((SGE_EVENT, MSG_HGRP_NONAMECHANGE));
-+ ERROR((SGE_EVENT, "%s", MSG_HGRP_NONAMECHANGE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_host_qmaster.c 2014-10-03 21:11:16.308851798 -0600
-@@ -392,7 +392,7 @@ int sge_del_host(sge_gdi_ctx_class_t *ct
- }
- else if (!strcasecmp(unique, "global"))
- {
-- ERROR((SGE_EVENT, MSG_OBJ_DELGLOBALHOST));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJ_DELGLOBALHOST));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return STATUS_ESEMANTIC;
-@@ -1025,7 +1025,7 @@ void sge_gdi_kill_exechost(sge_gdi_ctx_c
- DENTER(GDI_LAYER, "sge_gdi_kill_exechost");
-
- if (!manop_is_manager(packet->user)) {
-- ERROR((SGE_EVENT, MSG_OBJ_SHUTDOWNPERMS));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJ_SHUTDOWNPERMS));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR,
- ANSWER_QUALITY_ERROR);
- DEXIT;
-@@ -1074,7 +1074,7 @@ sge_gdi_ctx_class_t *ctx, sge_gdi_packet
- if (lGetNumberOfElem(task->answer_list) == 0) {
- /* no exechosts have been killed */
- DPRINTF((MSG_SGETEXT_NOEXECHOSTS));
-- INFO((SGE_EVENT, MSG_SGETEXT_NOEXECHOSTS));
-+ INFO((SGE_EVENT, "%s", MSG_SGETEXT_NOEXECHOSTS));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_OK, ANSWER_QUALITY_INFO);
- }
- } else {
-diff -up GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_job_qmaster.c 2014-10-03 21:11:16.309851822 -0600
-@@ -655,7 +655,7 @@ u_long32 step
- DENTER(TOP_LAYER, "empty_job_list_filter");
-
- if (all_users_flag) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_THEREARENOJOBS));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_THEREARENOJOBS));
- } else if (user_list_flag) {
- dstring user_list_string = DSTRING_INIT;
-
-@@ -716,7 +716,7 @@ u_long32 step
- }
- } else {
- /* Should not be possible */
-- ERROR((SGE_EVENT,
-+ ERROR((SGE_EVENT, "%s",
- was_modify?MSG_SGETEXT_NOJOBSMODIFIED:MSG_SGETEXT_NOJOBSDELETED));
- }
-
-@@ -834,7 +834,7 @@ char *ruser
- /* case 9 */
-
- if (all_users_flag && user_list_flag) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_SPECIFYONEORALLUSER));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_SPECIFYONEORALLUSER));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2531,7 +2531,7 @@ int *trigger)
-
- /* reject PE ranges change requests for jobs without PE request */
- if (!(pe_name=lGetString(new_job, JB_pe))) {
-- ERROR((SGE_EVENT, MSG_JOB_PERANGE_ONLY_FOR_PARALLEL));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_PERANGE_ONLY_FOR_PARALLEL));
- answer_list_add(alpp, SGE_EVENT, STATUS_EEXIST, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2875,7 +2875,7 @@ int job_verify_predecessors(lListElem *j
- predecessors_req = lGetList(job, JB_jid_request_list);
- predecessors_id = lCreateList("job_predecessors", JRE_Type);
- if (!predecessors_id) {
-- ERROR((SGE_EVENT, MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2980,7 +2980,7 @@ int job_verify_predecessors_ad(lListElem
- predecessors_req = lGetList(job, JB_ja_ad_request_list);
- predecessors_id = lCreateList("job_predecessors_ad", JRE_Type);
- if (!predecessors_id) {
-- ERROR((SGE_EVENT, MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_JOBDEPENDENCY_MEMORY ));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -2991,7 +2991,7 @@ int job_verify_predecessors_ad(lListElem
- if (!job_is_array(job)) {
- lFreeList(&predecessors_id);
- DPRINTF(("could not create array dependence for non-array job\n"));
-- ERROR((SGE_EVENT, MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -3068,7 +3068,7 @@ int job_verify_predecessors_ad(lListElem
- if (!job_is_array(pred_job)) {
- lFreeList(&predecessors_id);
- DPRINTF(("could not create array dependence on non-array job\n"));
-- ERROR((SGE_EVENT, MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_CANONLYSPECIFYHOLDJIDADWITHADOPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -3076,7 +3076,7 @@ int job_verify_predecessors_ad(lListElem
- if (!sge_task_depend_is_same_range(pred_job, job)) {
- lFreeList(&predecessors_id);
- DPRINTF(("could not create array dependence for jobs with different sub-task range\n"));
-- ERROR((SGE_EVENT, MSG_JOB_MOD_ARRAYJOBMUSTHAVESAMERANGEWITHADOPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_MOD_ARRAYJOBMUSTHAVESAMERANGEWITHADOPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-@@ -3444,7 +3444,7 @@ int verify_suitable_queues(lList **alpp,
- *trigger |= VERIFY_EVENT;
- }
- if (!a.pe) {
-- sprintf(SGE_EVENT, MSG_JOB_VERIFYFOUNDQ);
-+ sprintf(SGE_EVENT, "%s", MSG_JOB_VERIFYFOUNDQ);
- } else {
- sprintf(SGE_EVENT, MSG_JOB_VERIFYFOUNDSLOTS_I, a.slots);
- }
-@@ -4209,7 +4209,7 @@ job_verify_project(const lListElem *job,
- * every job *must* request a project
- */
- if (lGetNumberOfElem(projects) > 0) {
-- ERROR((SGE_EVENT, MSG_JOB_PRJREQUIRED));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_PRJREQUIRED));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = STATUS_EUNKNOWN;
- }
-@@ -4218,7 +4218,7 @@ job_verify_project(const lListElem *job,
- char* enforce_project = mconf_get_enforce_project();
-
- if (enforce_project != NULL && strcasecmp(enforce_project, "true") == 0) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_NO_PROJECT));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NO_PROJECT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = STATUS_EUNKNOWN;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_job_verify.c.format GE2011.11p1/source/daemons/qmaster/sge_job_verify.c
---- GE2011.11p1/source/daemons/qmaster/sge_job_verify.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_job_verify.c 2014-10-03 21:11:16.309851822 -0600
-@@ -169,7 +169,7 @@ int sge_job_verify_adjust(sge_gdi_ctx_cl
- if (ret == STATUS_OK) {
- if ((!JOB_TYPE_IS_BINARY(lGetUlong(jep, JB_type)) &&
- !lGetString(jep, JB_script_ptr) && lGetString(jep, JB_script_file))) {
-- ERROR((SGE_EVENT, MSG_JOB_NOSCRIPT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOSCRIPT));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = STATUS_EUNKNOWN;
- }
-@@ -661,7 +661,7 @@ int sge_job_verify_adjust(sge_gdi_ctx_cl
- */
- if (lGetUlong(jep, JB_priority) > BASE_PRIORITY && !manop_is_operator(ruser))
- {
-- ERROR((SGE_EVENT, MSG_JOB_NONADMINPRIO));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NONADMINPRIO));
- answer_list_add(alpp, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_EUNKNOWN);
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_pe_qmaster.c 2014-10-03 21:11:16.310851845 -0600
-@@ -212,7 +212,7 @@ int pe_mod(sge_gdi_ctx_class_t *ctx, lLi
- /* -------- PE_resource_utilization */
- if (add) {
- if (pe_set_slots_used(new_pe, 0)) {
-- ERROR((SGE_EVENT, MSG_MEM_MALLOC));
-+ ERROR((SGE_EVENT, "%s", MSG_MEM_MALLOC));
- answer_list_add(alpp, SGE_EVENT, STATUS_EMALLOC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return STATUS_EMALLOC;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_heartbeat.c 2014-10-03 21:11:16.310851845 -0600
-@@ -153,9 +153,9 @@ increment_heartbeat(sge_gdi_ctx_class_t
- if ( getuniquehostname(act_qmaster_name, act_resolved_qmaster_name, 0) == CL_RETVAL_OK &&
- sge_hostcmp(act_resolved_qmaster_name, qualified_hostname) != 0 ) {
- /* act_qmaster file has been changed */
-- WARNING((SGE_EVENT, MSG_HEART_ACT_QMASTER_FILE_CHANGED));
-+ WARNING((SGE_EVENT, "%s", MSG_HEART_ACT_QMASTER_FILE_CHANGED));
- if (sge_qmaster_shutdown_via_signal_thread(100) != 0) {
-- ERROR((SGE_EVENT, MSG_HEART_CANT_SIGNAL));
-+ ERROR((SGE_EVENT, "%s", MSG_HEART_CANT_SIGNAL));
- /* TODO: here the ctx reference is not transported back
- ** event_handler functions should use &ctx instead
- */
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_main.c 2014-10-03 21:11:16.310851845 -0600
-@@ -327,7 +327,7 @@ int main(int argc, char* argv[])
- max_enroll_tries--;
- if (max_enroll_tries <= 0) {
- /* exit after 30 seconds */
-- CRITICAL((SGE_EVENT, MSG_QMASTER_COMMUNICATION_ERRORS ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_QMASTER_COMMUNICATION_ERRORS ));
- SGE_EXIT((void**)&ctx, 1);
- }
- if (cl_com_get_handle(prognames[QMASTER],1) == NULL) {
-@@ -343,7 +343,7 @@ int main(int argc, char* argv[])
- */
- ret_val = cl_com_set_status_func(sge_qmaster_application_status);
- if (ret_val != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(ret_val)));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(ret_val)));
- }
-
- /*
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_process_message.c 2014-10-03 21:11:16.311851868 -0600
-@@ -321,7 +321,7 @@ do_report_request(sge_gdi_ctx_class_t *c
- }
-
- if (cull_unpack_list(&(aMsg->buf), &rep)) {
-- ERROR((SGE_EVENT,MSG_CULL_FAILEDINCULLUNPACKLISTREPORT));
-+ ERROR((SGE_EVENT, "%s", MSG_CULL_FAILEDINCULLUNPACKLISTREPORT));
- DRETURN_VOID;
- }
-
-@@ -571,7 +571,7 @@ static void sge_c_job_ack(sge_gdi_ctx_cl
- }
-
- default:
-- ERROR((SGE_EVENT, MSG_COM_ACK_UNKNOWN));
-+ ERROR((SGE_EVENT, "%s", MSG_COM_ACK_UNKNOWN));
- }
- DRETURN_VOID;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c.format GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmaster_threads.c 2014-10-03 21:11:16.311851868 -0600
-@@ -104,7 +104,7 @@ void sge_gdi_kill_master(sge_gdi_packet_
-
- if (sge_gdi_packet_parse_auth_info(packet, &(task->answer_list), &uid, username, sizeof(username),
- &gid, groupname, sizeof(groupname)) == -1) {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- DEXIT;
- return;
-@@ -113,7 +113,7 @@ void sge_gdi_kill_master(sge_gdi_packet_
- DPRINTF(("uid/username = %d/%s, gid/groupname = %d/%s\n", (int) uid, username, (int) gid, groupname));
-
- if (!manop_is_manager(username)) {
-- ERROR((SGE_EVENT, MSG_SHUTDOWN_SHUTTINGDOWNQMASTERREQUIRESMANAGERPRIVILEGES));
-+ ERROR((SGE_EVENT, "%s", MSG_SHUTDOWN_SHUTTINGDOWNQMASTERREQUIRESMANAGERPRIVILEGES));
- answer_list_add(&(task->answer_list), SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- DEXIT;
- return;
-@@ -249,12 +249,12 @@ void sge_become_admin_user(const char *a
- DENTER(TOP_LAYER, "sge_become_admin_user");
-
- if (sge_set_admin_username(admin_user, str) == -1) {
-- CRITICAL((SGE_EVENT, str));
-+ CRITICAL((SGE_EVENT, "%s", str));
- SGE_EXIT(NULL, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_ERROR_CANTSWITCHTOADMINUSER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_ERROR_CANTSWITCHTOADMINUSER));
- SGE_EXIT(NULL, 1);
- }
-
-diff -up GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_qmod_qmaster.c 2014-10-03 21:11:16.311851868 -0600
-@@ -656,7 +656,7 @@ monitoring_t *monitor
- DPRINTF(("cleaning queue >%s<\n", qname ));
-
- if (!manop_is_manager(user)) {
-- ERROR((SGE_EVENT, MSG_QUEUE_NOCLEANQPERMS));
-+ ERROR((SGE_EVENT, "%s", MSG_QUEUE_NOCLEANQPERMS));
- answer_list_add(answer, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DEXIT;
- return -1;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_resource_quota_qmaster.c 2014-10-03 21:11:16.312851892 -0600
-@@ -168,7 +168,7 @@ int rqs_mod(sge_gdi_ctx_class_t *ctx,
- attr_mod_sub_list(alpp, new_rule, RQR_limit, RQRL_name, rule,
- sub_command, SGE_ATTR_RQSRULES, SGE_OBJ_RQS, 0);
- } else {
-- ERROR((SGE_EVENT, MSG_RESOURCEQUOTA_NORULEDEFINED));
-+ ERROR((SGE_EVENT, "%s", MSG_RESOURCEQUOTA_NORULEDEFINED));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- goto ERROR;
-diff -up GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c.format GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c
---- GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_sched_prepare_data.c 2014-10-03 21:11:16.312851892 -0600
-@@ -399,7 +399,7 @@ ensure_valid_what_and_where(sge_where_wh
- where_what->what_queue == NULL || where_what->where_queue2 == NULL ||
- where_what->what_queue2 == NULL || where_what->where_all_queue == NULL ||
- where_what->what_pe == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SCHEDD_UNABLE_TO_SETUP_FILTER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SCHEDD_UNABLE_TO_SETUP_FILTER));
- }
- /* cleanup tmp data */
- if (tmp_what_descr != NULL)
-diff -up GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_userset_qmaster.c 2014-10-03 21:11:16.313851915 -0600
-@@ -287,13 +287,13 @@ static int dept_is_valid_defaultdepartme
- if (dept != NULL) {
- /* test 'type' */
- if (!(lGetUlong(dept, US_type) & US_DEPT)) {
-- ERROR((SGE_EVENT, MSG_QMASTER_DEPTFORDEFDEPARTMENT));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_DEPTFORDEFDEPARTMENT));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
- /* test user list */
- if (lGetNumberOfElem(lGetList(dept, US_entries)) > 0 ) {
-- ERROR((SGE_EVENT, MSG_QMASTER_AUTODEFDEPARTMENT));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_AUTODEFDEPARTMENT));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
-@@ -327,12 +327,12 @@ static int acl_is_valid_acl(lListElem *a
- if (acl != NULL) {
- if (!(lGetUlong(acl, US_type) & US_DEPT)) {
- if (lGetUlong(acl, US_fshare) > 0) {
-- ERROR((SGE_EVENT, MSG_QMASTER_ACLNOSHARE));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_ACLNOSHARE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
- if (lGetUlong(acl, US_oticket) > 0) {
-- ERROR((SGE_EVENT, MSG_QMASTER_ACLNOTICKET));
-+ ERROR((SGE_EVENT, "%s", MSG_QMASTER_ACLNOTICKET));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- ret = 0;
- }
-diff -up GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c.format GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c
---- GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/daemons/qmaster/sge_utility_qmaster.c 2014-10-03 21:11:16.313851915 -0600
-@@ -547,7 +547,7 @@ bool attr_mod_sub_list(lList **alpp, lLi
- }
-
- if (rstring == NULL || fstring == NULL) {
-- ERROR((SGE_EVENT, MSG_OBJECT_VALUEMISSING));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJECT_VALUEMISSING));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- ret = false;
-@@ -618,7 +618,7 @@ bool attr_mod_sub_list(lList **alpp, lLi
- }
-
- if (rstring == NULL) {
-- ERROR((SGE_EVENT, MSG_OBJECT_VALUEMISSING));
-+ ERROR((SGE_EVENT, "%s", MSG_OBJECT_VALUEMISSING));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/daemons/shadowd/shadowd.c.format GE2011.11p1/source/daemons/shadowd/shadowd.c
---- GE2011.11p1/source/daemons/shadowd/shadowd.c.format 2012-05-23 13:04:38.000000000 -0600
-+++ GE2011.11p1/source/daemons/shadowd/shadowd.c 2014-10-03 21:11:16.313851915 -0600
-@@ -125,7 +125,7 @@ static int shadowd_is_old_master_enrolle
-
- handle=cl_com_create_handle(&commlib_error, CL_CT_TCP, CL_CM_CT_MESSAGE, CL_FALSE, sge_qmaster_port, CL_TCP_DEFAULT,(char*)prognames[SHADOWD] , 0, 1,0 );
- if (handle == NULL) {
-- CRITICAL((SGE_EVENT,cl_get_error_text(commlib_error)));
-+ CRITICAL((SGE_EVENT, "%s", cl_get_error_text(commlib_error)));
- DRETURN(is_up_and_running);
- }
-
-@@ -284,12 +284,12 @@ char qmaster_out_file[SGE_PATH_MAX];
- }
-
- if (sge_set_admin_username(ctx->get_admin_user(ctx), err_str)) {
-- CRITICAL((SGE_EVENT, err_str));
-+ CRITICAL((SGE_EVENT, "%s", err_str));
- SGE_EXIT((void**)&ctx, 1);
- }
-
- if (sge_switch2admin_user()) {
-- CRITICAL((SGE_EVENT, MSG_SHADOWD_CANTSWITCHTOADMIN_USER));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SHADOWD_CANTSWITCHTOADMIN_USER));
- SGE_EXIT((void**)&ctx, 1);
- }
-
-@@ -365,7 +365,7 @@ char qmaster_out_file[SGE_PATH_MAX];
- if (ret == 0) {
- /* we can start a qmaster on this host */
- if (qmaster_lock(QMASTER_LOCK_FILE)) {
-- ERROR((SGE_EVENT, MSG_SHADOWD_FAILEDTOLOCKQMASTERSOMBODYWASFASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_SHADOWD_FAILEDTOLOCKQMASTERSOMBODYWASFASTER));
- } else {
- int out, err;
-
-@@ -402,7 +402,7 @@ char qmaster_out_file[SGE_PATH_MAX];
- ret = startprog(out, err, NULL, binpath, qmaster_name, NULL);
- sge_switch2admin_user();
- if (ret) {
-- ERROR((SGE_EVENT, MSG_SHADOWD_CANTSTARTQMASTER));
-+ ERROR((SGE_EVENT, "%s", MSG_SHADOWD_CANTSTARTQMASTER));
- }
- close(out);
- } else {
-@@ -533,7 +533,7 @@ static int check_if_valid_shadow(char *b
- DRETURN(-1);
- }
-
-- sprintf(binpath, binary_path); /* copy global configuration path */
-+ sprintf(binpath, "%s", binary_path); /* copy global configuration path */
- DPRINTF((""SFQ"\n", binpath));
- DPRINTF(("we are a candidate for shadow master\n"));
-
-diff -up GE2011.11p1/source/libs/comm/cl_communication.c.format GE2011.11p1/source/libs/comm/cl_communication.c
---- GE2011.11p1/source/libs/comm/cl_communication.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/comm/cl_communication.c 2014-10-03 21:11:16.315851962 -0600
-@@ -3728,7 +3728,7 @@ int cl_com_connection_complete_request(c
- if ( cm_message->dst->comp_host != NULL ) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_CANT_RESOLVE_DESTINATION_HOST_S, cm_message->dst->comp_host );
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, retval , tmp_buffer );
- unique_host = strdup("(HOST_NOT_RESOLVABLE)");
-@@ -3745,7 +3745,7 @@ int cl_com_connection_complete_request(c
- if ( cm_message->dst->comp_host != NULL && unique_host != NULL ) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_REMOTE_DESTINATION_HOSTNAME_X_NOT_Y_SS, cm_message->dst->comp_host, unique_host);
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_DESTINATION_HOST );
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer );
-
-@@ -3789,7 +3789,7 @@ int cl_com_connection_complete_request(c
- if (cm_message->rdata->comp_host != NULL) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_CANT_RESOLVE_RDATA_HOST_S , cm_message->rdata->comp_host);
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_RDATA_HOST);
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_RDATA_HOST);
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, retval , tmp_buffer );
- unique_host = strdup("(HOST_NOT_RESOLVABLE)");
-@@ -3810,7 +3810,7 @@ int cl_com_connection_complete_request(c
- if ( cm_message->rdata->comp_host != NULL && unique_host != NULL ) {
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_REMOTE_RDATA_HOSTNAME_X_NOT_Y_SS, cm_message->rdata->comp_host, unique_host);
- } else {
-- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_EMPTY_RDATA_HOST );
-+ snprintf(tmp_buffer, 256, "%s", MSG_CL_TCP_FW_EMPTY_RDATA_HOST );
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer );
-
-@@ -3949,9 +3949,9 @@ int cl_com_connection_complete_request(c
- snprintf(tmp_buffer, 256, MSG_CL_TCP_FW_IP_ADDRESS_RESOLVING_X_NOT_Y_SS, connection->client_host_name, connection->remote->comp_host );
- } else {
- if (connection->client_host_name == NULL) {
-- snprintf(tmp_buffer,256, MSG_CL_TCP_FW_CANT_RESOLVE_CLIENT_IP );
-+ snprintf(tmp_buffer,256, "%s", MSG_CL_TCP_FW_CANT_RESOLVE_CLIENT_IP );
- } else {
-- snprintf(tmp_buffer,256, MSG_CL_TCP_FW_EMPTY_REMOTE_HOST );
-+ snprintf(tmp_buffer,256, "%s", MSG_CL_TCP_FW_EMPTY_REMOTE_HOST );
- }
- }
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_LOCAL_HOSTNAME_ERROR, tmp_buffer );
-diff -up GE2011.11p1/source/libs/comm/cl_ssl_framework.c.format GE2011.11p1/source/libs/comm/cl_ssl_framework.c
---- GE2011.11p1/source/libs/comm/cl_ssl_framework.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/comm/cl_ssl_framework.c 2014-10-03 21:11:16.512856557 -0600
-@@ -1071,9 +1071,9 @@ static int cl_com_ssl_build_symbol_table
-
- #elif defined(FREEBSD)
- #ifdef RTLD_NODELETE
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_GLOBAL | RTLD_NODELETE);
- #else
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_GLOBAL);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_GLOBAL);
- #endif /* RTLD_NODELETE */
-
- #elif defined(HPUX)
-@@ -1085,9 +1085,9 @@ static int cl_com_ssl_build_symbol_table
-
- #else
- #ifdef RTLD_NODELETE
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY | RTLD_NODELETE);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY | RTLD_NODELETE);
- #else
-- cl_com_ssl_crypto_handle = dlopen ("libssl.so", RTLD_LAZY);
-+ cl_com_ssl_crypto_handle = dlopen ("libssl.so.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10.10", RTLD_LAZY);
- #endif /* RTLD_NODELETE */
- #endif
-
-@@ -2020,7 +2020,7 @@ static int cl_com_ssl_transform_ssl_erro
- if (buffer_copy == NULL) {
- return CL_RETVAL_MALLOC;
- }
-- snprintf(buffer_copy, buflen, buffer);
-+ snprintf(buffer_copy, buflen, "%s", buffer);
-
- help = strtok_r(buffer_copy, ":", &lasts);
- if (help != NULL) {
-@@ -2066,7 +2066,7 @@ static int cl_com_ssl_transform_ssl_erro
- free(module);
- return CL_RETVAL_MALLOC;
- }
-- snprintf(error_text, buflen, buffer);
-+ snprintf(error_text, buflen, "%s", buffer);
- }
-
-
-@@ -2153,11 +2153,11 @@ static int cl_com_ssl_log_ssl_errors(con
- ret_val = cl_com_ssl_transform_ssl_error(ssl_error,buffer,512, &transformed_ssl_error);
-
- if (transformed_ssl_error != NULL) {
-- snprintf(help_buf, 1024, transformed_ssl_error);
-+ snprintf(help_buf, 1024, "%s", transformed_ssl_error);
- free(transformed_ssl_error);
- transformed_ssl_error = NULL;
- } else {
-- snprintf(help_buf, 1024, buffer);
-+ snprintf(help_buf, 1024, "%s", buffer);
- }
-
- if (ret_val != CL_RETVAL_DO_IGNORE) {
-@@ -3087,7 +3087,7 @@ int cl_com_ssl_connection_complete_accep
- if (connection->client_host_name != NULL) {
- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR_S, connection->client_host_name);
- } else {
-- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR);
-+ snprintf(tmp_buffer,1024, "%s", MSG_CL_COMMLIB_SSL_ACCEPT_TIMEOUT_ERROR);
- }
-
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_SSL_ACCEPT_HANDSHAKE_TIMEOUT, tmp_buffer);
-@@ -3102,7 +3102,7 @@ int cl_com_ssl_connection_complete_accep
- if (connection->client_host_name != NULL) {
- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_ERROR_S, connection->client_host_name);
- } else {
-- snprintf(tmp_buffer,1024, MSG_CL_COMMLIB_SSL_ACCEPT_ERROR);
-+ snprintf(tmp_buffer,1024, "%s", MSG_CL_COMMLIB_SSL_ACCEPT_ERROR);
- }
-
- cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_SSL_ACCEPT_ERROR, tmp_buffer);
-diff -up GE2011.11p1/source/libs/cull/cull_file.c.format GE2011.11p1/source/libs/cull/cull_file.c
---- GE2011.11p1/source/libs/cull/cull_file.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/cull/cull_file.c 2014-10-03 21:11:16.317852008 -0600
-@@ -91,7 +91,7 @@ int lWriteElemToDisk(const lListElem *ep
-
- if (!prefix && !name)
- {
-- ERROR((SGE_EVENT, MSG_CULL_NOPREFIXANDNOFILENAMEINWRITEELMTODISK ));
-+ ERROR((SGE_EVENT, "%s", MSG_CULL_NOPREFIXANDNOFILENAMEINWRITEELMTODISK ));
- DEXIT;
- return 1;
- }
-@@ -210,7 +210,7 @@ lListElem *lReadElemFromDisk(const char
-
- if (!prefix && !name)
- {
-- ERROR((SGE_EVENT, MSG_CULL_NOPREFIXANDNOFILENAMEINREADELEMFROMDISK ));
-+ ERROR((SGE_EVENT, "%s", MSG_CULL_NOPREFIXANDNOFILENAMEINREADELEMFROMDISK ));
- DEXIT;
- return NULL;
- }
-@@ -242,7 +242,7 @@ lListElem *lReadElemFromDisk(const char
- size = statbuf.st_size;
- if (((SGE_OFF_T)size != statbuf.st_size) || !(buf = malloc(statbuf.st_size)))
- {
-- CRITICAL((SGE_EVENT, MSG_CULL_LEMALLOC));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_LEMALLOC));
- DEXIT;
- return NULL;
- }
-diff -up GE2011.11p1/source/libs/cull/cull_multitype.c.format GE2011.11p1/source/libs/cull/cull_multitype.c
---- GE2011.11p1/source/libs/cull/cull_multitype.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/cull/cull_multitype.c 2014-10-03 21:11:16.318852032 -0600
-@@ -102,8 +102,8 @@ int incompatibleType2(const char *fmt,..
- vsprintf(buf, fmt, ap);
- va_end(ap);
-
-- CRITICAL((SGE_EVENT, buf));
-- fprintf(stderr, buf);
-+ CRITICAL((SGE_EVENT, "%s", buf));
-+ fprintf(stderr, "%s", buf);
-
- abort();
- DEXIT;
-@@ -751,7 +751,7 @@ lUlong lGetPosUlong(const lListElem *ep,
- if (pos < 0) {
- /* someone has called lGetPosUlong() */
- /* makro with an invalid nm */
-- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSULONG_GOTINVALIDPOSITION ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSULONG_GOTINVALIDPOSITION ));
- DEXIT;
- abort();
- }
-@@ -994,7 +994,7 @@ lListElem *lGetPosObject(const lListElem
- if (pos < 0) {
- /* someone has called lGetPosUlong() */
- /* makro with an invalid nm */
-- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSOBJECT_GOTANINVALIDPOS ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSOBJECT_GOTANINVALIDPOS ));
- DEXIT;
- abort();
- }
-@@ -1031,7 +1031,7 @@ lList *lGetPosList(const lListElem *ep,
- if (pos < 0) {
- /* someone has called lGetPosUlong() */
- /* makro with an invalid nm */
-- CRITICAL((SGE_EVENT, MSG_CULL_GETPOSLIST_GOTANINVALIDPOS ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_CULL_GETPOSLIST_GOTANINVALIDPOS ));
- DEXIT;
- abort();
- }
-diff -up GE2011.11p1/source/libs/evc/sge_event_client.c.format GE2011.11p1/source/libs/evc/sge_event_client.c
---- GE2011.11p1/source/libs/evc/sge_event_client.c.format 2012-05-23 13:04:44.000000000 -0600
-+++ GE2011.11p1/source/libs/evc/sge_event_client.c 2014-10-03 21:11:16.320852078 -0600
-@@ -1085,7 +1085,7 @@ static int ec2_set_edtime(sge_evc_class_
- DENTER(EVC_LAYER, "ec2_set_edtime");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- ret = (lGetUlong(sge_evc->ec, EV_d_time) != interval);
- if (ret > 0) {
-@@ -1124,7 +1124,7 @@ static int ec2_get_edtime(sge_evc_class_
- DENTER(EVC_LAYER, "ec2_get_edtime");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- interval = lGetUlong(sge_evc->ec, EV_d_time);
- }
-@@ -1166,7 +1166,7 @@ static bool ec2_set_flush_delay(sge_evc_
- DENTER(EVC_LAYER, "ec2_set_flush_delay");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- ret = (lGetUlong(sge_evc->ec, EV_flush_delay) != flush_delay) ? true : false;
-
-@@ -1207,7 +1207,7 @@ static int ec2_get_flush_delay(sge_evc_c
- DENTER(EVC_LAYER, "ec2_get_flush_delay");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- flush_delay = lGetUlong(sge_evc->ec, EV_flush_delay);
- }
-@@ -1256,7 +1256,7 @@ static bool ec2_set_busy_handling(sge_ev
- DENTER(EVC_LAYER, "ec2_set_busy_handling");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- DPRINTF(("EVC: change event client to "sge_U32CFormat"\n", (u_long32)handling));
-
-@@ -1299,7 +1299,7 @@ static ev_busy_handling ec2_get_busy_han
- DENTER(EVC_LAYER, "ec2_get_busy_handling");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- handling = (ev_busy_handling)lGetUlong(sge_evc->ec, EV_busy_handling);
- }
-@@ -1318,7 +1318,7 @@ static bool ec2_deregister_local(sge_evc
-
- /* not yet initialized? Nothing to shutdown */
- if (sge_evc == NULL || sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- local_t *evc_local = &(thiz->ec_local);
- u_long32 id = sge_evc->ec_reg_id;
-@@ -1390,7 +1390,7 @@ ec2_register_local(sge_evc_class_t *thiz
- DPRINTF(("trying to register as internal client with preset %d (0 means EV_ID_ANY)\n", (int)sge_evc->ec_reg_id));
-
- if (sge_evc->ec == NULL) {
-- WARNING((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ WARNING((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- ret = false;
- } else {
- lList *alp = NULL;
-@@ -1493,7 +1493,7 @@ static bool ec2_register(sge_evc_class_t
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- WARNING((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ WARNING((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- lList *lp, *alp;
- lListElem *aep;
-@@ -1728,7 +1728,7 @@ static bool ec2_subscribe(sge_evc_class_
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1758,7 +1758,7 @@ static void ec2_add_subscriptionElement(
- DENTER(EVC_LAYER, "ec2_add_subscriptionElement");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1796,7 +1796,7 @@ static void ec2_mod_subscription_flush(s
- DENTER(EVC_LAYER, "ec2_mod_subscription_flush");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1851,7 +1851,7 @@ static bool ec2_mod_subscription_where(s
- DENTER(EVC_LAYER, "ec2_mod_subscription_where");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event <= sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1882,7 +1882,7 @@ static void ec2_remove_subscriptionEleme
- DENTER(EVC_LAYER, "ec2_remove_subscriptionElement");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
-@@ -1981,7 +1981,7 @@ static bool ec2_unsubscribe(sge_evc_clas
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event ));
- } else {
-@@ -1996,7 +1996,7 @@ static bool ec2_unsubscribe(sge_evc_clas
-
- } else {
- if (event == sgeE_QMASTER_GOES_DOWN || event == sgeE_SHUTDOWN || event == sgeE_ACK_TIMEOUT) {
-- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS));
- } else {
- ec2_remove_subscriptionElement(thiz, event);
- }
-@@ -2083,14 +2083,14 @@ static int ec2_get_flush(sge_evc_class_t
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event ));
- } else {
- lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event);
-
- if (sub_event == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (lGetBool(sub_event, EVS_flush)) {
- ret = lGetUlong(sub_event, EVS_interval);
- }
-@@ -2144,7 +2144,7 @@ static bool ec2_set_flush(sge_evc_class_
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event ));
- } else {
-@@ -2159,7 +2159,7 @@ static bool ec2_set_flush(sge_evc_class_
- lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event);
-
- if (sub_event == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- }
- else {
- ec2_mod_subscription_flush(thiz, event, EV_FLUSHED, interval);
-@@ -2212,14 +2212,14 @@ static bool ec2_unset_flush(sge_evc_clas
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (event < sgeE_ALL_EVENTS || event >= sgeE_EVENTSIZE) {
- WARNING((SGE_EVENT, MSG_EVENT_ILLEGALEVENTID_I, event));
- } else {
- lListElem *sub_event = lGetElemUlong(lGetList(sge_evc->ec, EV_subscribed), EVS_id, event);
-
- if (sub_event == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- }
- else {
- ec2_mod_subscription_flush(thiz, event, EV_NOT_FLUSHED, EV_NO_FLUSH);
-@@ -2318,7 +2318,7 @@ static bool ec2_set_busy(sge_evc_class_t
- DENTER(EVC_LAYER, "ec2_set_busy");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- lSetUlong(sge_evc->ec, EV_busy, busy);
- ret = true;
-@@ -2360,7 +2360,7 @@ static bool ec2_get_busy(sge_evc_class_t
- DENTER(EVC_LAYER, "ec2_get_busy");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- /* JG: TODO: EV_busy should be boolean datatype */
- ret = (lGetUlong(sge_evc->ec, EV_busy) > 0) ? true : false;
-@@ -2398,7 +2398,7 @@ static bool ec2_set_session(sge_evc_clas
- DENTER(EVC_LAYER, "ec2_set_session");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- lSetString(sge_evc->ec, EV_session, session);
-
-@@ -2436,7 +2436,7 @@ static const char *ec2_get_session(sge_e
- DENTER(EVC_LAYER, "ec2_get_session");
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else {
- ret = lGetString(sge_evc->ec, EV_session);
- }
-@@ -2463,7 +2463,7 @@ static ev_registration_id ec2_get_id(sge
-
- DENTER(EVC_LAYER, "ec2_get_id");
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- DRETURN(EV_ID_INVALID);
- }
-
-@@ -2512,7 +2512,7 @@ static bool ec2_commit_local(sge_evc_cla
-
- /* not yet initialized? Cannot send modification to qmaster! */
- if (sge_evc->ec == NULL) {
-- DPRINTF((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ DPRINTF((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- } else if (thiz->ec_need_new_registration(thiz)) {
- /* not (yet) registered? Cannot send modification to qmaster! */
- DPRINTF((MSG_EVENT_NOTREGISTERED));
-@@ -2790,7 +2790,7 @@ static bool ec2_get(sge_evc_class_t *thi
- PROF_START_MEASUREMENT(SGE_PROF_EVENTCLIENT);
-
- if (sge_evc->ec == NULL) {
-- ERROR((SGE_EVENT, MSG_EVENT_UNINITIALIZED_EC));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_UNINITIALIZED_EC));
- ret = false;
- } else if (thiz->ec_need_new_registration(thiz)) {
- sge_evc->next_event = 1;
-@@ -2937,7 +2937,7 @@ static bool ec2_get(sge_evc_class_t *thi
- lGetUlong(sge_evc->ec, EV_id), NULL, &alp)
- != CL_RETVAL_OK) {
- answer_list_output(&alp);
-- WARNING((SGE_EVENT, MSG_COMMD_FAILEDTOSENDACKEVENTDELIVERY ));
-+ WARNING((SGE_EVENT, "%s", MSG_COMMD_FAILEDTOSENDACKEVENTDELIVERY ));
- } else {
- DPRINTF(("Sent ack for all events lower or equal %d\n",
- (sge_evc->next_event - 1)));
-@@ -3075,7 +3075,7 @@ static bool ck_event_number(lList *lp, u
- do not change waiting_for because
- we still wait for this number
- */
-- ERROR((SGE_EVENT, MSG_EVENT_EVENTSWITHNOINCREASINGNUMBERS ));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_EVENTSWITHNOINCREASINGNUMBERS ));
- if (wrong_number) {
- *wrong_number = j;
- }
-@@ -3152,7 +3152,7 @@ static bool get_event_list(sge_evc_class
- ret = false;
- } else {
- if (cull_unpack_list(&pb, report_list)) {
-- ERROR((SGE_EVENT, MSG_LIST_FAILEDINCULLUNPACKREPORT ));
-+ ERROR((SGE_EVENT, "%s", MSG_LIST_FAILEDINCULLUNPACKREPORT ));
- ret = false;
- }
- clear_packbuffer(&pb);
-diff -up GE2011.11p1/source/libs/evm/sge_event_master.c.format GE2011.11p1/source/libs/evm/sge_event_master.c
---- GE2011.11p1/source/libs/evm/sge_event_master.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/evm/sge_event_master.c 2014-10-03 21:11:16.321852102 -0600
-@@ -458,7 +458,7 @@ int sge_add_event_client(lListElem *clio
-
- /* check event client object structure */
- if (lCompListDescr(lGetElemDescr(clio), EV_Type) != 0) {
-- ERROR((SGE_EVENT, MSG_EVE_INCOMPLETEEVENTCLIENT));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_INCOMPLETEEVENTCLIENT));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_DENIED);
- }
-@@ -471,7 +471,7 @@ int sge_add_event_client(lListElem *clio
- }
-
- if (lGetBool(clio, EV_changed) && lGetList(clio, EV_subscribed) == NULL) {
-- ERROR((SGE_EVENT, MSG_EVE_INVALIDSUBSCRIPTION));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_INVALIDSUBSCRIPTION));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
- }
-@@ -481,7 +481,7 @@ int sge_add_event_client(lListElem *clio
-
- if (Event_Master_Control.is_prepare_shutdown) {
- sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex);
-- ERROR((SGE_EVENT, MSG_EVE_QMASTERISGOINGDOWN));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_QMASTERISGOINGDOWN));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
- }
-@@ -525,7 +525,7 @@ int sge_add_event_client(lListElem *clio
- */
- if (update_func == NULL && !manop_is_manager(ruser)) {
- sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex);
-- ERROR((SGE_EVENT, MSG_WRONG_USER_FORFIXEDID ));
-+ ERROR((SGE_EVENT, "%s", MSG_WRONG_USER_FORFIXEDID ));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC, ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
- }
-@@ -728,7 +728,7 @@ sge_event_master_process_mod_event_clien
- if (lGetBool(clio, EV_changed) && lGetList(clio, EV_subscribed) == NULL) {
- sge_mutex_unlock("event_master_mutex", SGE_FUNC, __LINE__, &Event_Master_Control.mutex);
- SGE_UNLOCK(LOCK_GLOBAL, LOCK_READ);
-- ERROR((SGE_EVENT, MSG_EVE_INVALIDSUBSCRIPTION));
-+ ERROR((SGE_EVENT, "%s", MSG_EVE_INVALIDSUBSCRIPTION));
- DRETURN_VOID;
- }
-
-@@ -1142,7 +1142,7 @@ int sge_shutdown_event_client(u_long32 e
-
- /* Print out a message about the event. */
- if (event_client_id == EV_ID_SCHEDD) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_COM_KILLED_SCHEDULER));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_COM_KILLED_SCHEDULER));
- } else {
- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_COM_SHUTDOWNNOTIFICATION_SUS,
- lGetString(client, EV_name),
-diff -up GE2011.11p1/source/libs/gdi/qm_name.c.format GE2011.11p1/source/libs/gdi/qm_name.c
---- GE2011.11p1/source/libs/gdi/qm_name.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/qm_name.c 2014-10-03 21:11:16.321852102 -0600
-@@ -74,7 +74,7 @@ char *err_str
- if (!master_host || !master_file) {
- if (err_str) {
- if (master_host) {
-- sprintf(err_str, MSG_GDI_NULLPOINTERPASSED );
-+ sprintf(err_str, "%s", MSG_GDI_NULLPOINTERPASSED );
- }
- }
- DRETURN(-1);
-diff -up GE2011.11p1/source/libs/gdi/sge_gdi2.c.format GE2011.11p1/source/libs/gdi/sge_gdi2.c
---- GE2011.11p1/source/libs/gdi/sge_gdi2.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_gdi2.c 2014-10-03 21:11:16.322852125 -0600
-@@ -662,7 +662,7 @@ sge_gdi2_get_any_request(sge_gdi_ctx_cla
- }
-
- if (!rhost) {
-- ERROR((SGE_EVENT, MSG_GDI_RHOSTISNULLFORGETANYREQUEST ));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_RHOSTISNULLFORGETANYREQUEST ));
- PROF_STOP_MEASUREMENT(SGE_PROF_GDI);
- DRETURN(-1);
- }
-@@ -1212,7 +1212,7 @@ gdi2_send_message(sge_gdi_ctx_class_t *s
- if (handle == NULL)
- {
- ERROR((SGE_EVENT, MSG_GDI_CANT_CREATE_HANDLE_TOEXECD_S, tocomproc));
-- ERROR((SGE_EVENT, cl_get_error_text(commlib_error)));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(commlib_error)));
- }
- }
- }
-@@ -1327,7 +1327,7 @@ gdi2_receive_message(sge_gdi_ctx_class_t
- if (handle == NULL)
- {
- ERROR((SGE_EVENT, MSG_GDI_CANT_CREATE_HANDLE_TOEXECD_S, fromcommproc));
-- ERROR((SGE_EVENT, cl_get_error_text(commlib_error)));
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(commlib_error)));
- }
- }
- }
-@@ -1482,7 +1482,7 @@ lListElem **lepp
- }
-
- if (!is_global_requested && !lepp) {
-- ERROR((SGE_EVENT, MSG_NULLPOINTER));
-+ ERROR((SGE_EVENT, "%s", MSG_NULLPOINTER));
- lFreeElem(&hep);
- DRETURN(-3);
- }
-@@ -1523,7 +1523,7 @@ lListElem **lepp
- }
-
- if (!(*gepp = lGetElemHost(lp, CONF_name, SGE_GLOBAL_NAME))) {
-- ERROR((SGE_EVENT, MSG_CONF_NOGLOBAL));
-+ ERROR((SGE_EVENT, "%s", MSG_CONF_NOGLOBAL));
- lFreeList(&lp);
- lFreeElem(&hep);
- DRETURN(-5);
-@@ -1764,12 +1764,12 @@ int report_list_send(sge_gdi_ctx_class_t
- DRETURN(-2);
-
- case PACK_FORMAT:
-- ERROR((SGE_EVENT, MSG_GDI_REPORTFORMATERROR));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_REPORTFORMATERROR));
- clear_packbuffer(&pb);
- DRETURN(-3);
-
- default:
-- ERROR((SGE_EVENT, MSG_GDI_REPORTUNKNOWERROR));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_REPORTUNKNOWERROR));
- clear_packbuffer(&pb);
- DRETURN(-1);
- }
-diff -up GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c.format GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c
---- GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_gdi_ctx.c 2014-10-03 21:11:16.323852148 -0600
-@@ -898,7 +898,7 @@ static int sge_gdi_ctx_class_prepare_enr
- case SCHEDD:
- case EXECD:
- {
-- INFO((SGE_EVENT,MSG_GDI_MULTI_THREADED_STARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_GDI_MULTI_THREADED_STARTUP));
- /* if SGE_DEBUG_LEVEL environment is set we use gdi log flush function */
- /* you can set commlib debug level with env SGE_COMMLIB_DEBUG */
- if (env_sge_commlib_debug != NULL) {
-@@ -911,7 +911,7 @@ static int sge_gdi_ctx_class_prepare_enr
- break;
- default:
- {
-- INFO((SGE_EVENT,MSG_GDI_SINGLE_THREADED_STARTUP));
-+ INFO((SGE_EVENT, "%s", MSG_GDI_SINGLE_THREADED_STARTUP));
- if (env_sge_commlib_debug != NULL) {
- cl_ret = cl_com_setup_commlib(CL_NO_THREAD, CL_LOG_OFF, sge_gdi_ctx_log_flush_func);
- } else {
-@@ -1171,7 +1171,7 @@ static int sge_gdi_ctx_class_prepare_enr
- alive_back = thiz->is_alive(thiz);
- cl_ret = cl_com_set_error_func(general_communication_error);
- if (cl_ret != CL_RETVAL_OK) {
-- ERROR((SGE_EVENT, cl_get_error_text(cl_ret)) );
-+ ERROR((SGE_EVENT, "%s", cl_get_error_text(cl_ret)) );
- }
-
- if (alive_back == CL_RETVAL_OK && getenv("SGE_TEST_HEARTBEAT_TIMEOUT") == NULL ) {
-@@ -1300,7 +1300,7 @@ static int sge_gdi_ctx_class_is_alive(sg
- sge_gdi_ctx_class_error(thiz, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR,
- "cl_commlib_get_endpoint_status failed: "SFQ, cl_get_error_text(cl_ret));
- } else {
-- DEBUG((SGE_EVENT,MSG_GDI_QMASTER_STILL_RUNNING));
-+ DEBUG((SGE_EVENT, "%s", MSG_GDI_QMASTER_STILL_RUNNING));
- }
-
- if (status != NULL) {
-@@ -1970,7 +1970,7 @@ int sge_gdi2_setup(sge_gdi_ctx_class_t *
-
- if (context_ref && sge_gdi_ctx_is_setup(*context_ref)) {
- if (alpp_was_null) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_GDI_ALREADY_SETUP));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_GDI_ALREADY_SETUP));
- } else {
- answer_list_add_sprintf(alpp, STATUS_EEXIST, ANSWER_QUALITY_WARNING,
- MSG_GDI_GDI_ALREADY_SETUP);
-diff -up GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c.format GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c
---- GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_gdi_packet_internal.c 2014-10-03 21:11:16.324852172 -0600
-@@ -537,7 +537,7 @@ sge_gdi_packet_execute_external(sge_gdi_
- cl_get_error_text(commlib_error)));
- }
- } else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_SENDINGGDIREQUESTFAILED));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_SENDINGGDIREQUESTFAILED));
- }
- answer_list_add(answer_list, SGE_EVENT, STATUS_NOQMASTER, ANSWER_QUALITY_ERROR);
- ret = false;
-@@ -689,7 +689,7 @@ sge_gdi_packet_execute_external(sge_gdi_
- }
- if (gdi_mismatch) {
- /* For unusual errors, give more detail */
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_MISMATCH_SEND_RECEIVE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_MISMATCH_SEND_RECEIVE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_NOQMASTER, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-diff -up GE2011.11p1/source/libs/gdi/sge_qexec.c.format GE2011.11p1/source/libs/gdi/sge_qexec.c
---- GE2011.11p1/source/libs/gdi/sge_qexec.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_qexec.c 2014-10-03 21:11:16.324852172 -0600
-@@ -190,7 +190,7 @@ sge_tid_t sge_qexecve(sge_gdi_ctx_class_
-
- if (init_packbuffer(&pb, 1024, 0) != PACK_SUCCESS) {
- lFreeElem(&petrep);
-- sprintf(lasterror, MSG_GDI_OUTOFMEMORY);
-+ sprintf(lasterror, "%s", MSG_GDI_OUTOFMEMORY);
- DRETURN(NULL);
- }
-
-diff -up GE2011.11p1/source/libs/gdi/sge_security.c.format GE2011.11p1/source/libs/gdi/sge_security.c
---- GE2011.11p1/source/libs/gdi/sge_security.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/gdi/sge_security.c 2014-10-03 21:11:16.325852195 -0600
-@@ -173,7 +173,7 @@ int sge_ssl_setup_security_path(const ch
- DENTER(TOP_LAYER, "sge_ssl_setup_security_path");
-
- if (progname == NULL) {
-- CRITICAL((SGE_EVENT, MSG_GDI_NO_VALID_PROGRAMM_NAME));
-+ CRITICAL((SGE_EVENT, "%s", MSG_GDI_NO_VALID_PROGRAMM_NAME));
- FREE(user_name);
- DRETURN(-1);
- }
-@@ -473,7 +473,7 @@ static cl_bool_t ssl_cert_verify_func(cl
-
- if (value == NULL) {
- /* This should never happen */
-- CRITICAL((SGE_EVENT, MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
- DRETURN(CL_FALSE);
- }
-
-@@ -1385,15 +1385,15 @@ sge_gdi_packet_parse_auth_info(sge_gdi_p
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOIMP, ANSWER_QUALITY_ERROR);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_FAILEDTOEXTRACTAUTHINFO));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ENOMGR, ANSWER_QUALITY_ERROR);
- }
- DRETURN(ret);
-diff -up GE2011.11p1/source/libs/japi/drmaa.c.format GE2011.11p1/source/libs/japi/drmaa.c
---- GE2011.11p1/source/libs/japi/drmaa.c.format 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/libs/japi/drmaa.c 2014-10-03 21:11:16.326852218 -0600
-@@ -3885,7 +3885,7 @@ static char *drmaa_expand_wd_path(const
-
- /* First look for the job index placeholder. It is illegal. */
- if (strstr(path, "$TASK_ID") != NULL) {
-- sprintf(str, MSG_DRMAA_INC_NOT_ALLOWED);
-+ sprintf(str, "%s", MSG_DRMAA_INC_NOT_ALLOWED);
- answer_list_add(answer_list, str, STATUS_ENOSUCHUSER,
- ANSWER_QUALITY_ERROR);
- DRETURN(NULL);
-diff -up GE2011.11p1/source/libs/mir/sge_mirror.c.format GE2011.11p1/source/libs/mir/sge_mirror.c
---- GE2011.11p1/source/libs/mir/sge_mirror.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/mir/sge_mirror.c 2014-10-03 21:11:16.327852242 -0600
-@@ -953,10 +953,10 @@ static sge_mirror_error _sge_mirror_unsu
- evc->ec_unsubscribe(evc, sgeE_SCHEDDMONITOR);
- break;
- case SGE_TYPE_SHUTDOWN:
-- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS));
- break;
- case SGE_TYPE_MARK_4_REGISTRATION:
-- ERROR((SGE_EVENT, MSG_EVENT_HAVETOHANDLEEVENTS));
-+ ERROR((SGE_EVENT, "%s", MSG_EVENT_HAVETOHANDLEEVENTS));
- break;
- case SGE_TYPE_SUBMITHOST:
- evc->ec_unsubscribe(evc, sgeE_SUBMITHOST_LIST);
-@@ -1062,7 +1062,7 @@ sge_mirror_error sge_mirror_process_even
- lFreeList(&event_list);
- }
- } else {
-- WARNING((SGE_EVENT, MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
-+ WARNING((SGE_EVENT, "%s", MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
- evc->ec_mark4registration(evc);
- ret = SGE_EM_TIMEOUT;
- }
-@@ -1071,7 +1071,7 @@ sge_mirror_error sge_mirror_process_even
- test_debug++;
- if (test_debug > 3) {
- test_debug = 0;
-- WARNING((SGE_EVENT, MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
-+ WARNING((SGE_EVENT, "%s", MSG_MIRROR_QMASTERALIVETIMEOUTEXPIRED));
- evc->ec_mark4registration(evc);
- ret = SGE_EM_TIMEOUT;
- }
-diff -up GE2011.11p1/source/libs/sched/sge_select_queue.c.format GE2011.11p1/source/libs/sched/sge_select_queue.c
---- GE2011.11p1/source/libs/sched/sge_select_queue.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/sched/sge_select_queue.c 2014-10-03 21:11:16.329852288 -0600
-@@ -339,7 +339,7 @@ find_best_result(dispatch_t r1, dispatch
- DRETURN(DISPATCH_MISSING_ATTR);
- }
-
-- CRITICAL((SGE_EVENT, MSG_JOBMATCHINGUNEXPECTEDRESULT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_JOBMATCHINGUNEXPECTEDRESULT));
- DRETURN(DISPATCH_NEVER);
- }
-
-@@ -893,7 +893,7 @@ parallel_maximize_slots_pe(sge_assignmen
- /* --- prepare the posible slots for the binary search */
- max_slotsp = (max_slots - min_slots+1);
- if (!add_pe_slots_to_category(&use_category, &max_slotsp, pe, min_slots, max_slots, pe_range)) {
-- ERROR((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- DRETURN(DISPATCH_NEVER_CAT);
- }
- if (max_slotsp == 0) {
-@@ -6380,7 +6380,7 @@ void sge_create_load_list(const lList *q
-
- error:
- DPRINTF(("error in sge_create_load_list!"));
-- ERROR((SGE_EVENT, MSG_SGETEXT_CONSUMABLE_AS_LOAD));
-+ ERROR((SGE_EVENT, "%s", MSG_SGETEXT_CONSUMABLE_AS_LOAD));
- sge_free_load_list(load_list);
- DRETURN_VOID;
-
-diff -up GE2011.11p1/source/libs/sched/sge_ssi.c.format GE2011.11p1/source/libs/sched/sge_ssi.c
---- GE2011.11p1/source/libs/sched/sge_ssi.c.format 2012-05-23 13:04:40.000000000 -0600
-+++ GE2011.11p1/source/libs/sched/sge_ssi.c 2014-10-03 21:11:16.329852288 -0600
-@@ -202,7 +202,7 @@ bool sge_ssi_job_start(sge_evc_class_t *
- lListElem *queue, *granted_queue;
-
- if(tasks[i].host_name == NULL) {
-- ERROR((SGE_EVENT, MSG_SSI_MISSINGHOSTNAMEINTASKLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_SSI_MISSINGHOSTNAMEINTASKLIST));
- DRETURN(false);
- }
-
-diff -up GE2011.11p1/source/libs/sgeobj/config.c.format GE2011.11p1/source/libs/sgeobj/config.c
---- GE2011.11p1/source/libs/sgeobj/config.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/config.c 2014-10-03 21:11:16.330852312 -0600
-@@ -749,7 +749,7 @@ bool set_conf_enum(lList **alpp, lList *
- }
-
- if(!uval) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_GDI_CONFIGINVALIDQUEUESPECIFIED ));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_GDI_CONFIGINVALIDQUEUESPECIFIED ));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DEXIT;
- return false;
-diff -up GE2011.11p1/source/libs/sgeobj/sge_answer.c.format GE2011.11p1/source/libs/sgeobj/sge_answer.c
---- GE2011.11p1/source/libs/sgeobj/sge_answer.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_answer.c 2014-10-03 21:11:16.330852312 -0600
-@@ -1016,19 +1016,19 @@ static bool answer_log(lListElem *answer
-
- switch (lGetUlong(answer, AN_quality)) {
- case ANSWER_QUALITY_CRITICAL:
-- CRITICAL((SGE_EVENT, lGetString(answer, AN_text)));
-+ CRITICAL((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- ret = true;
- break;
- case ANSWER_QUALITY_ERROR:
-- ERROR((SGE_EVENT, lGetString(answer, AN_text)));
-+ ERROR((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- ret = true;
- break;
- case ANSWER_QUALITY_WARNING:
-- WARNING((SGE_EVENT, lGetString(answer, AN_text)));
-+ WARNING((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- break;
- case ANSWER_QUALITY_INFO:
- if (show_info) {
-- INFO((SGE_EVENT, lGetString(answer, AN_text)));
-+ INFO((SGE_EVENT, "%s", lGetString(answer, AN_text)));
- }
- break;
- default:
-diff -up GE2011.11p1/source/libs/sgeobj/sge_attr.c.format GE2011.11p1/source/libs/sgeobj/sge_attr.c
---- GE2011.11p1/source/libs/sgeobj/sge_attr.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_attr.c 2014-10-03 21:11:16.331852335 -0600
-@@ -414,7 +414,7 @@ attr_list_add(lList **this_list, lList *
- if (ambiguous_href_list != NULL &&
- lGetNumberOfElem(*ambiguous_href_list) >= 1 &&
- !(flags & HOSTATTR_ALLOW_AMBIGUITY)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_RESULTUNAMBIGUOUS_S));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_RESULTUNAMBIGUOUS_S));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- } else {
-@@ -583,7 +583,7 @@ attr_list_find_value(const lList *this_l
- /*
- * Should never happen.
- */
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOCONFVALUE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOCONFVALUE));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- }
-@@ -640,7 +640,7 @@ attr_list_find_value_href(const lList *t
- /*
- * Should never happen.
- */
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOCONFVALUE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOCONFVALUE));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- }
-@@ -852,7 +852,7 @@ attr_list_parse_from_string(lList **this
- value[0] = '\0';
- value++;
- } else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT,
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s",
- MSG_ATTR_EQUALSIGNEXPRECTED));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
-@@ -895,7 +895,7 @@ attr_list_parse_from_string(lList **this
- }
- }
- } else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTR_NOVALUEGIVEN));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTR_NOVALUEGIVEN));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_ERROR1, ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/libs/sgeobj/sge_calendar.c.format GE2011.11p1/source/libs/sgeobj/sge_calendar.c
---- GE2011.11p1/source/libs/sgeobj/sge_calendar.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_calendar.c 2014-10-03 21:11:16.331852335 -0600
-@@ -475,7 +475,7 @@ static u_long32 is_week_entry_active(lLi
- state = is_week_entry_active(new_tm, week_entry, limit, next_state, rec_count++);
- }
- else {
-- ERROR((SGE_EVENT, MSG_CALENDAR_CALCTERMINATED));
-+ ERROR((SGE_EVENT, "%s", MSG_CALENDAR_CALCTERMINATED));
- }
-
- lFreeElem(&new_tm);
-@@ -1293,7 +1293,7 @@ static int disabled_year_entry(lListElem
- DRETURN(-1);
- }
- } else {
-- sprintf(parse_error, MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE );
-+ sprintf(parse_error, "%s", MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE );
- goto ERROR;
- }
-
-@@ -1402,7 +1402,7 @@ static int year_day_range(lListElem **tm
- DRETURN(-1);
- }
- if (tm_yday_cmp(t1, t2)>0) {
-- sprintf(parse_error, MSG_ANSWER_FIRSTYESTERDAYINRANGEMUSTBEBEFORESECONDYESTERDAY);
-+ sprintf(parse_error, "%s", MSG_ANSWER_FIRSTYESTERDAYINRANGEMUSTBEBEFORESECONDYESTERDAY);
- lFreeElem(&t1);
- DRETURN(-1);
- }
-@@ -1442,7 +1442,7 @@ static int year_day(lListElem **tm) {
- }
-
- if (scan(NULL, NULL)!=DOT) {
-- sprintf(parse_error, MSG_PARSE_MISSINGPOINTAFTERDAY);
-+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGPOINTAFTERDAY);
- DRETURN(-1);
- }
- eat_token();
-@@ -1452,7 +1452,7 @@ static int year_day(lListElem **tm) {
- }
-
- if (scan(NULL, NULL)!=DOT) {
-- sprintf(parse_error, MSG_PARSE_MISSINGPOINTAFTERMONTH );
-+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGPOINTAFTERMONTH );
- DRETURN(-1);
- }
- eat_token();
-@@ -1634,7 +1634,7 @@ static int daytime_range(lListElem **tmr
- goto ERROR;
- }
- if (scan(NULL, NULL)!=MINUS) {
-- sprintf(parse_error, MSG_PARSE_MISSINGDASHINDAYTIMERANGE);
-+ sprintf(parse_error, "%s", MSG_PARSE_MISSINGDASHINDAYTIMERANGE);
- goto ERROR;
- }
- eat_token();
-@@ -1642,7 +1642,7 @@ static int daytime_range(lListElem **tmr
- goto ERROR;
- }
- if (!tm_daytime_cmp(t1, t2)) {
-- sprintf(parse_error, MSG_PARSE_RANGEBEGISEQUALTOEND);
-+ sprintf(parse_error, "%s", MSG_PARSE_RANGEBEGISEQUALTOEND);
- goto ERROR;
- }
-
-@@ -1703,7 +1703,7 @@ static int daytime(lListElem **tm) {
- SUCCESS:
- if (h==24) {
- if (m || s) {
-- sprintf(parse_error, MSG_PARSE_DAYTIMESBEYOND24HNOTALLOWED);
-+ sprintf(parse_error, "%s", MSG_PARSE_DAYTIMESBEYOND24HNOTALLOWED);
- DRETURN(-1);
- }
- }
-@@ -1804,7 +1804,7 @@ static int disabled_week_list(lList **al
-
- /* complain about still unused tokens */
- if (scan(NULL, NULL)!=NO_TOKEN) {
-- sprintf(parse_error, MSG_PARSE_UNRECOGNIZEDTOKENATEND);
-+ sprintf(parse_error, "%s", MSG_PARSE_UNRECOGNIZEDTOKENATEND);
- goto ERROR;
- }
-
-@@ -1857,7 +1857,7 @@ static int disabled_week_entry(lListElem
- goto ERROR;
- }
- } else {
-- sprintf(parse_error, MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE);
-+ sprintf(parse_error, "%s", MSG_ANSWER_GOTEQUALWITHOUTDAYTIMERANGEORSTATE);
- goto ERROR;
- }
-
-@@ -2153,7 +2153,7 @@ static int week_day_range(lListElem **tm
- goto ERROR;
-
- if (tm_wday_cmp(t1, t2)==0) {
-- sprintf(parse_error, MSG_PARSE_FOUNDUSELESSWEEKDAYRANGE);
-+ sprintf(parse_error, "%s", MSG_PARSE_FOUNDUSELESSWEEKDAYRANGE);
- goto ERROR;
- }
- }
-@@ -2204,7 +2204,7 @@ static int week_day(lListElem **tm) {
- DENTER(TOP_LAYER, "week_day");
-
- if (scan(NULL, NULL)!=STRING) {
-- sprintf(parse_error, MSG_PARSE_EXPECTEDSTRINGFORWEEKDAY);
-+ sprintf(parse_error, "%s", MSG_PARSE_EXPECTEDSTRINGFORWEEKDAY);
- DRETURN(-1);
- }
- s = get_string();
-@@ -2286,7 +2286,7 @@ static int scan(const char *s, token_set
- for (j=0; t[j] && isdigit((int) t[j]); j++) {
- number = old_number * 10 + (t[j]-'0');
- if (number<old_number) {
-- ERROR((SGE_EVENT, MSG_PARSE_OVERFLOWERRORWHILEPARSING));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_OVERFLOWERRORWHILEPARSING));
- token = ERR_TOKEN;
- token_is_valid = 1;
- DRETURN(token);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_centry.c.format GE2011.11p1/source/libs/sgeobj/sge_centry.c
---- GE2011.11p1/source/libs/sgeobj/sge_centry.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_centry.c 2014-10-03 21:11:16.332852358 -0600
-@@ -882,7 +882,7 @@ centry_list_parse_from_string(lList *com
- /* allocate space for attribute list if no list is passed */
- if (complex_attributes == NULL) {
- if ((complex_attributes = lCreateList("qstat_l_requests", CE_Type)) == NULL) {
-- ERROR((SGE_EVENT, MSG_PARSE_NOALLOCATTRLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NOALLOCATTRLIST));
- DRETURN(NULL);
- }
- }
-@@ -920,7 +920,7 @@ centry_list_parse_from_string(lList *com
- /* create new element, fill in the values and append it */
- if ( (complex_attribute= lGetElemStr(complex_attributes, CE_name, attr)) == NULL) {
- if ((complex_attribute = lCreateElem(CE_Type)) == NULL) {
-- ERROR((SGE_EVENT, MSG_PARSE_NOALLOCATTRELEM));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NOALLOCATTRELEM));
- lFreeList(&complex_attributes);
- sge_free_saved_vars(context);
- DRETURN(NULL);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_conf.c.format GE2011.11p1/source/libs/sgeobj/sge_conf.c
---- GE2011.11p1/source/libs/sgeobj/sge_conf.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_conf.c 2014-10-03 21:11:16.535857093 -0600
-@@ -308,7 +308,7 @@ static int jsv_threshold = 5000;
- static tConfEntry conf_entries[] = {
- { "execd_spool_dir", 1, NULL, 1, NULL },
- { "mailer", 1, MAILER, 1, NULL },
-- { "xterm", 1, "/usr/bin/X11/xterm",1, NULL },
-+ { "xterm", 1, "/usr/bin/xterm",1, NULL },
- { "load_sensor", 1, "none", 1, NULL },
- { "prolog", 1, PROLOG, 1, NULL },
- { "epilog", 1, EPILOG, 1, NULL },
-@@ -1051,7 +1051,7 @@ int merge_configuration(lList **answer_l
- lFreeList(&mlist);
-
- if (!global) {
-- WARNING((SGE_EVENT, MSG_CONF_NOCONFIGFROMMASTER));
-+ WARNING((SGE_EVENT, "%s", MSG_CONF_NOCONFIGFROMMASTER));
- DRETURN(-2);
- }
-
-diff -up GE2011.11p1/source/libs/sgeobj/sge_cqueue.c.format GE2011.11p1/source/libs/sgeobj/sge_cqueue.c
---- GE2011.11p1/source/libs/sgeobj/sge_cqueue.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_cqueue.c 2014-10-03 21:11:16.333852381 -0600
-@@ -1251,7 +1251,7 @@ cqueue_xattr_pre_gdi(lList *this_list, l
- cqueue_attribute_array[index].href_attr);
-
- if (strcmp(HOSTREF_DEFAULT, attr_hostname)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT,
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s",
- MSG_CQUEUE_NONDEFNOTALLOWED));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -1507,7 +1507,7 @@ cqueue_list_locate_qinstance_msg(lList *
- sge_dstring_free(&host_domain_buffer);
- } else {
- if (raise_error) {
-- ERROR((SGE_EVENT, MSG_CQUEUE_FULLNAMEISNULL));
-+ ERROR((SGE_EVENT, "%s", MSG_CQUEUE_FULLNAMEISNULL));
- }
- }
- DRETURN(ret);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_job.c.format GE2011.11p1/source/libs/sgeobj/sge_job.c
---- GE2011.11p1/source/libs/sgeobj/sge_job.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_job.c 2014-10-03 21:11:16.334852405 -0600
-@@ -1166,11 +1166,11 @@ int job_list_add_job(lList **job_list, c
- DENTER(TOP_LAYER, "job_list_add_job");
-
- if (!job_list) {
-- ERROR((SGE_EVENT, MSG_JOB_JLPPNULL));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_JLPPNULL));
- DRETURN(1);
- }
- if (!job) {
-- ERROR((SGE_EVENT, MSG_JOB_JEPNULL));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_JEPNULL));
- DRETURN(1);
- }
-
-@@ -1906,7 +1906,7 @@ void job_check_correct_id_sublists(lList
- if (field[i] != JB_ja_structure)
- range_correct_end(range);
- if (range_is_id_within(range, 0)) {
-- ERROR((SGE_EVENT, MSG_JOB_NULLNOTALLOWEDT));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NULLNOTALLOWEDT));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN,
- ANSWER_QUALITY_ERROR);
- DRETURN_VOID;
-@@ -1941,7 +1941,7 @@ void job_check_correct_id_sublists(lList
- }
- has_structure = !range_list_is_empty(lGetList(job, JB_ja_structure));
- if (!has_structure) {
-- ERROR((SGE_EVENT, MSG_JOB_NOIDNOTALLOWED));
-+ ERROR((SGE_EVENT, "%s", MSG_JOB_NOIDNOTALLOWED));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN,
- ANSWER_QUALITY_ERROR);
- DRETURN_VOID;
-@@ -2608,7 +2608,7 @@ int job_resolve_host_for_path_list(const
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- } else if (res != CL_RETVAL_PARAMS) {
-- ERROR((SGE_EVENT,MSG_PARSE_NULLPOINTERRECEIVED ));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_NULLPOINTERRECEIVED ));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- }
-@@ -2625,13 +2625,13 @@ int job_resolve_host_for_path_list(const
-
- if(hostname == NULL){
- if(temp_hostname == NULL){
-- ERROR((SGE_EVENT, MSG_PARSE_DUPLICATEHOSTINFILESPEC));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_DUPLICATEHOSTINFILESPEC));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- }
- }
- else if( temp_hostname && strcmp(hostname, temp_hostname)==0){
-- ERROR((SGE_EVENT, MSG_PARSE_DUPLICATEHOSTINFILESPEC));
-+ ERROR((SGE_EVENT, "%s", MSG_PARSE_DUPLICATEHOSTINFILESPEC));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret_error=true;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c.format GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c
---- GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_jsv_script.c 2014-10-03 21:11:16.335852428 -0600
-@@ -3029,7 +3029,7 @@ bool jsv_is_modify_rejected(sge_gdi_ctx_
- /*
- * JSV is active but no modification allowed
- */
-- ERROR((SGE_EVENT, MSG_JSV_ALLOWED));
-+ ERROR((SGE_EVENT, "%s", MSG_JSV_ALLOWED));
- answer_list_add(answer_list, SGE_EVENT, STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = true;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_pack.c.format GE2011.11p1/source/libs/sgeobj/sge_pack.c
---- GE2011.11p1/source/libs/sgeobj/sge_pack.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_pack.c 2014-10-03 21:11:16.335852428 -0600
-@@ -69,7 +69,7 @@ lCondition *lWhereFromElem(const lListEl
- if (lGetUlong(where, PACK_id) == SGE_WHERE) {
- size = getByteArray(&buffer, where, PACK_string);
- if (size <= 0){
-- ERROR((SGE_EVENT, MSG_PACK_INVALIDPACKDATA ));
-+ ERROR((SGE_EVENT, "%s", MSG_PACK_INVALIDPACKDATA ));
- } else if ((ret = init_packbuffer_from_buffer(&pb, buffer, size)) == PACK_SUCCESS) {
- cull_unpack_cond(&pb, &cond);
- clear_packbuffer(&pb);
-@@ -117,7 +117,7 @@ lEnumeration *lWhatFromElem(const lListE
- if (lGetUlong(what, PACK_id) == SGE_WHAT) {
- size = getByteArray(&buffer, what, PACK_string);
- if (size <= 0){
-- ERROR((SGE_EVENT, MSG_PACK_INVALIDPACKDATA ));
-+ ERROR((SGE_EVENT, "%s", MSG_PACK_INVALIDPACKDATA ));
- } else if ((ret = init_packbuffer_from_buffer(&pb, buffer, size)) == PACK_SUCCESS) {
- cull_unpack_enum(&pb, &cond);
- clear_packbuffer(&pb);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_qref.c.format GE2011.11p1/source/libs/sgeobj/sge_qref.c
---- GE2011.11p1/source/libs/sgeobj/sge_qref.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_qref.c 2014-10-03 21:11:16.335852428 -0600
-@@ -815,7 +815,7 @@ qref_list_is_valid(const lList *this_lis
- }
- }
- } else {
-- ERROR((SGE_EVENT, MSG_QREF_QNOTREQUESTABLE));
-+ ERROR((SGE_EVENT, "%s", MSG_QREF_QNOTREQUESTABLE));
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
- ret = false;
-diff -up GE2011.11p1/source/libs/sgeobj/sge_range.c.format GE2011.11p1/source/libs/sgeobj/sge_range.c
---- GE2011.11p1/source/libs/sgeobj/sge_range.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_range.c 2014-10-03 21:11:16.336852451 -0600
-@@ -1694,7 +1694,7 @@ void range_parse_from_string(lListElem *
- DRETURN_VOID;
- }
- else {
-- sprintf( msg, MSG_GDI_NEGATIVSTEP );
-+ sprintf( msg, "%s", MSG_GDI_NEGATIVSTEP );
- answer_list_add(answer_list, msg, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
- lFreeElem(&r);
-@@ -1769,7 +1769,7 @@ range_list_parse_from_string(lList **thi
- s; s = sge_strtok_r(NULL, RANGE_SEPARATOR_CHARS, &context)) {
- if (!first && undefined) {
- /* first was undefined - no more ranges allowed */
-- ERROR((SGE_EVENT, MSG_GDI_UNEXPECTEDRANGEFOLLOWINGUNDEFINED));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_UNEXPECTEDRANGEFOLLOWINGUNDEFINED));
- sge_free_saved_vars(context);
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
-@@ -1785,7 +1785,7 @@ range_list_parse_from_string(lList **thi
- undefined = true;
- } else {
- /* second range may not be undefined ! */
-- ERROR((SGE_EVENT, MSG_GDI_UNEXPECTEDUNDEFINEDFOLLOWINGRANGE));
-+ ERROR((SGE_EVENT, "%s", MSG_GDI_UNEXPECTEDUNDEFINEDFOLLOWINGRANGE));
- sge_free_saved_vars(context);
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX,
- ANSWER_QUALITY_ERROR);
-diff -up GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c.format GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c
---- GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_resource_quota.c 2014-10-03 21:11:16.337852475 -0600
-@@ -106,7 +106,7 @@ bool rqs_parse_filter_from_string(lListE
- /* We have a expanded list */
- lSetBool(tmp_filter, RQRF_expand, true);
- if (buffer[strlen(buffer)-1] != '}') {
-- ERROR((SGE_EVENT, MSG_RESOURCEQUOTA_NOVALIDEXPANDEDLIST));
-+ ERROR((SGE_EVENT, "%s", MSG_RESOURCEQUOTA_NOVALIDEXPANDEDLIST));
- answer_list_add(alp, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- DRETURN(false);
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c.format GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c
---- GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_schedd_conf.c 2014-10-03 21:11:16.337852475 -0600
-@@ -571,7 +571,7 @@ bool sconf_set_config(lList **config, lL
- } else {
- *master_sconf_list = store;
- if (!*master_sconf_list) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_USE_DEFAULT_CONFIG));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_USE_DEFAULT_CONFIG));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_WARNING);
-
- *master_sconf_list = lCreateList("schedd config list", SC_Type);
-@@ -2579,7 +2579,7 @@ void sconf_print_config(void){
- DENTER(TOP_LAYER, "sconf_print_config");
-
- if (!sconf_is()){
-- ERROR((SGE_EVENT, MSG_SCONF_NO_CONFIG));
-+ ERROR((SGE_EVENT, "%s", MSG_SCONF_NO_CONFIG));
- DRETURN_VOID;
- }
-
-@@ -2815,7 +2815,7 @@ bool sconf_validate_config_(lList **answ
- pos.new_config = true;
-
- if (!calc_pos()){
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_INCOMPLETE_SCHEDD_CONFIG));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_INCOMPLETE_SCHEDD_CONFIG));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -2912,7 +2912,7 @@ bool sconf_validate_config_(lList **answ
- const char *schedd_info = lGetString(lFirst(*(object_type_get_master_list(SGE_TYPE_SCHEDD_CONF))), SC_schedd_job_info);
-
- if (schedd_info == NULL){
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -2928,7 +2928,7 @@ bool sconf_validate_config_(lList **answ
- else if (!strcmp("job_list", key))
- ikey = SCHEDD_JOB_INFO_JOB_LIST;
- else {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDPARAM ));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -2939,7 +2939,7 @@ bool sconf_validate_config_(lList **answ
- INF_NOT_ALLOWED);
- if (rlp == NULL) {
- lFreeList(&alp);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ATTRIB_SCHEDDJOBINFONOVALIDJOBLIST));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ATTRIB_SCHEDDJOBINFONOVALIDJOBLIST));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-@@ -3050,7 +3050,7 @@ bool sconf_validate_config_(lList **answ
- else {
- /* ensure we get a non-zero/non-infinity duration default in reservation scheduling mode */
- if (max_reservation != 0 && uval == 0) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_RR_REQUIRES_DEFAULT_DURATION));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_RR_REQUIRES_DEFAULT_DURATION));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_ulong.c.format GE2011.11p1/source/libs/sgeobj/sge_ulong.c
---- GE2011.11p1/source/libs/sgeobj/sge_ulong.c.format 2012-05-23 13:04:43.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_ulong.c 2014-10-03 21:11:16.338852498 -0600
-@@ -272,7 +272,7 @@ ulong_parse_date_time_from_string(u_long
- memset(tmp_str, 0, sizeof(tmp_str));
-
- if (!string || string[0] == '\0') {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_NODATE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_NODATE));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -285,7 +285,7 @@ ulong_parse_date_time_from_string(u_long
- }
-
- if (strlen(string) > sizeof(stringT)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_STARTTIMETOOLONG));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_STARTTIMETOOLONG));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -309,7 +309,7 @@ ulong_parse_date_time_from_string(u_long
-
- if ((i != 0) && (i != 2)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDSECONDS));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDSECONDS));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -325,7 +325,7 @@ ulong_parse_date_time_from_string(u_long
-
- if ((i != 8) && (i != 10) && (i != 12)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDHOURMIN));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDHOURMIN));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -369,7 +369,7 @@ ulong_parse_date_time_from_string(u_long
- timeptr.tm_mon=atoi(tmp_str)-1;/* 00==Jan, we don't like that do we */
- if ((timeptr.tm_mon>11)||(timeptr.tm_mon<0)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDMONTH));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDMONTH));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -392,7 +392,7 @@ ulong_parse_date_time_from_string(u_long
- if ((timeptr.tm_mday > 31) || (timeptr.tm_mday < 1)) {
- /* actually mktime() should frigging do it */
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDDAY));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDDAY));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -410,7 +410,7 @@ ulong_parse_date_time_from_string(u_long
- non_seconds+=2;
-
- if ((timeptr.tm_hour > 23) || (timeptr.tm_hour < 0)) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDHOUR));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDHOUR));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -428,7 +428,7 @@ ulong_parse_date_time_from_string(u_long
-
- if ((timeptr.tm_min > 59)||(timeptr.tm_min < 0)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDMINUTE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDMINUTE));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -445,7 +445,7 @@ ulong_parse_date_time_from_string(u_long
- }
- if ((timeptr.tm_sec>59)||(timeptr.tm_mday<0)) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_INVALIDSECOND));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_INVALIDSECOND));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -468,7 +468,7 @@ ulong_parse_date_time_from_string(u_long
-
- if (gmt_secs < 0) {
- sge_free_saved_vars(context);
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_PARSE_NODATEFROMINPUT));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_PARSE_NODATEFROMINPUT));
- if (answer_list) {
- answer_list_add(answer_list, SGE_EVENT,
- STATUS_EUNKNOWN, ANSWER_QUALITY_ERROR);
-@@ -610,7 +610,7 @@ ulong_parse_value_from_string(u_long32 *
-
- *this_ulong = strtol(string, &s, 10);
- if (string == s) {
-- SGE_ADD_MSG_ID(sprintf(SGE_EVENT, MSG_ULNG_INVALID_VALUE));
-+ SGE_ADD_MSG_ID(sprintf(SGE_EVENT, "%s", MSG_ULNG_INVALID_VALUE));
- answer_list_add(answer_list, SGE_EVENT, STATUS_ESYNTAX, ANSWER_QUALITY_ERROR);
- ret = false;
- }
-diff -up GE2011.11p1/source/libs/sgeobj/sge_userset.c.format GE2011.11p1/source/libs/sgeobj/sge_userset.c
---- GE2011.11p1/source/libs/sgeobj/sge_userset.c.format 2012-05-23 13:04:42.000000000 -0600
-+++ GE2011.11p1/source/libs/sgeobj/sge_userset.c 2014-10-03 21:11:16.338852498 -0600
-@@ -279,7 +279,7 @@ int userset_validate_entries(lListElem *
-
- for_each(ep, lGetList(userset, US_entries)) {
- if (!lGetPosString(ep, name_pos)) {
-- ERROR((SGE_EVENT, MSG_US_INVALIDUSERNAME));
-+ ERROR((SGE_EVENT, "%s", MSG_US_INVALIDUSERNAME));
- answer_list_add(alpp, SGE_EVENT, STATUS_ESEMANTIC,
- ANSWER_QUALITY_ERROR);
- DRETURN(STATUS_ESEMANTIC);
-diff -up GE2011.11p1/source/libs/uti/config_file.c.format GE2011.11p1/source/libs/uti/config_file.c
---- GE2011.11p1/source/libs/uti/config_file.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/config_file.c 2014-10-03 21:11:16.339852521 -0600
-@@ -440,7 +440,7 @@ char **allowed
- }
-
- if (name_len==0) {
-- sprintf(err_str, MSG_CONF_ATLEASTONECHAR);
-+ sprintf(err_str, "%s", MSG_CONF_ATLEASTONECHAR);
- if (config_errfunc)
- config_errfunc(err_str);
- return 1;
-diff -up GE2011.11p1/source/libs/uti/setup_path.c.format GE2011.11p1/source/libs/uti/setup_path.c
---- GE2011.11p1/source/libs/uti/setup_path.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/setup_path.c 2014-10-03 21:11:16.339852521 -0600
-@@ -348,7 +348,7 @@ bool sge_setup_paths(u_long32 progid, co
- cell_root = sge_malloc(strlen(sge_root) + strlen(sge_cell) + 2);
- if (cell_root == NULL) {
- if (error_dstring == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SGETEXT_NOMEM));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SGETEXT_NOMEM));
- SGE_EXIT(NULL, 1);
- } else {
- sge_dstring_copy_string(error_dstring, MSG_SGETEXT_NOMEM);
-diff -up GE2011.11p1/source/libs/uti/sge_arch.c.format GE2011.11p1/source/libs/uti/sge_arch.c
---- GE2011.11p1/source/libs/uti/sge_arch.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_arch.c 2014-10-03 21:11:16.339852521 -0600
-@@ -140,7 +140,7 @@ error:
- if (buffer != NULL) {
- sge_strlcpy(buffer, MSG_SGEROOTNOTSET, size);
- } else {
-- CRITICAL((SGE_EVENT, MSG_SGEROOTNOTSET));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SGEROOTNOTSET));
- }
- }
-
-@@ -240,7 +240,7 @@ const char *sge_get_alias_path(void)
-
- len = strlen(sge_root) + strlen(sge_cell) + strlen(COMMON_DIR) + strlen(ALIAS_FILE) + 5;
- if (!(cp = malloc(len))) {
-- CRITICAL((SGE_EVENT, MSG_MEMORY_MALLOCFAILEDFORPATHTOHOSTALIASFILE ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_MALLOCFAILEDFORPATHTOHOSTALIASFILE ));
- SGE_EXIT(NULL, 1);
- }
-
-diff -up GE2011.11p1/source/libs/uti/sge_bootstrap.c.format GE2011.11p1/source/libs/uti/sge_bootstrap.c
---- GE2011.11p1/source/libs/uti/sge_bootstrap.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_bootstrap.c 2014-10-03 21:11:16.340852545 -0600
-@@ -469,7 +469,7 @@ bool sge_bootstrap(const char *bootstrap
- /* get filepath of bootstrap file */
- if (bootstrap_file == NULL) {
- if (error_dstring == NULL) {
-- CRITICAL((SGE_EVENT, MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE));
- } else {
- sge_dstring_sprintf(error_dstring, MSG_UTI_CANNOTRESOLVEBOOTSTRAPFILE);
- }
-diff -up GE2011.11p1/source/libs/uti/sge_csp_path.c.format GE2011.11p1/source/libs/uti/sge_csp_path.c
---- GE2011.11p1/source/libs/uti/sge_csp_path.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_csp_path.c 2014-10-03 21:11:16.340852545 -0600
-@@ -151,7 +151,7 @@ static cl_bool_t ssl_cert_verify_func(cl
-
- if (value == NULL) {
- /* This should never happen */
-- CRITICAL((SGE_EVENT, MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SEC_CERT_VERIFY_FUNC_NO_VAL));
- DEXIT;
- return CL_FALSE;
- }
-diff -up GE2011.11p1/source/libs/uti/sge_edit.c.format GE2011.11p1/source/libs/uti/sge_edit.c
---- GE2011.11p1/source/libs/uti/sge_edit.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_edit.c 2014-10-03 21:11:16.340852545 -0600
-@@ -53,7 +53,7 @@ int sge_edit(const char *fname, uid_t my
-
- if (fname == NULL)
- {
-- ERROR((SGE_EVENT, MSG_NULLPOINTER));
-+ ERROR((SGE_EVENT, "%s", MSG_NULLPOINTER));
- return -1;
- }
-
-diff -up GE2011.11p1/source/libs/uti/sge_loadmem.c.format GE2011.11p1/source/libs/uti/sge_loadmem.c
---- GE2011.11p1/source/libs/uti/sge_loadmem.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_loadmem.c 2014-10-03 21:11:16.341852568 -0600
-@@ -580,7 +580,7 @@ int sge_loadmem(sge_mem_info_t *mem_info
- pagesize = sysconf(_SC_PAGESIZE);
- first = 0;
- if (pagesize == -1) {
-- ERROR((SGE_EVENT, MSG_SYSTEM_NOPAGESIZEASSUME8192 ));
-+ ERROR((SGE_EVENT, "%s", MSG_SYSTEM_NOPAGESIZEASSUME8192 ));
- pagesize = 8192;
- }
- }
-diff -up GE2011.11p1/source/libs/uti/sge_monitor.c.format GE2011.11p1/source/libs/uti/sge_monitor.c
---- GE2011.11p1/source/libs/uti/sge_monitor.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_monitor.c 2014-10-03 21:11:16.341852568 -0600
-@@ -236,7 +236,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->output_line2 = (dstring*) malloc(sizeof(dstring));
-
- if (monitor->output_line1 == NULL || monitor->output_line2 == NULL) {
-- CRITICAL((SGE_EVENT, MSG_UTI_MONITOR_MEMERROR));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROR));
- exit(1);
- }
-
-@@ -257,7 +257,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_sch_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -269,7 +269,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_gdi_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -281,7 +281,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_lis_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -293,7 +293,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_edt_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-@@ -305,7 +305,7 @@ sge_monitor_init(monitoring_t *monitor,
- monitor->ext_output = &ext_tet_output;
- } else {
- monitor->ext_type = NONE_EXT;
-- ERROR((SGE_EVENT, MSG_UTI_MONITOR_MEMERROREXT));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MONITOR_MEMERROREXT));
- }
- break;
-
-diff -up GE2011.11p1/source/libs/uti/sge_os.c.format GE2011.11p1/source/libs/uti/sge_os.c
---- GE2011.11p1/source/libs/uti/sge_os.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_os.c 2014-10-03 21:11:16.341852568 -0600
-@@ -352,12 +352,12 @@ bool sge_daemonize_prepare(sge_gdi_ctx_c
-
- /* create pipe */
- if ( pipe(fd_pipe) < 0) {
-- CRITICAL((SGE_EVENT, MSG_UTI_DAEMONIZE_CANT_PIPE));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_CANT_PIPE));
- DRETURN(false);
- }
-
- if ( fcntl(fd_pipe[0], F_SETFL, O_NONBLOCK) != 0) {
-- CRITICAL((SGE_EVENT, MSG_UTI_DAEMONIZE_CANT_FCNTL_PIPE));
-+ CRITICAL((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_CANT_FCNTL_PIPE));
- DRETURN(false);
- }
-
-@@ -418,13 +418,13 @@ bool sge_daemonize_prepare(sge_gdi_ctx_c
-
- switch(exit_status) {
- case SGE_DEAMONIZE_OK:
-- INFO((SGE_EVENT, MSG_UTI_DAEMONIZE_OK));
-+ INFO((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_OK));
- break;
- case SGE_DAEMONIZE_DEAD_CHILD:
-- WARNING((SGE_EVENT, MSG_UTI_DAEMONIZE_DEAD_CHILD));
-+ WARNING((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_DEAD_CHILD));
- break;
- case SGE_DAEMONIZE_TIMEOUT:
-- WARNING((SGE_EVENT, MSG_UTI_DAEMONIZE_TIMEOUT));
-+ WARNING((SGE_EVENT, "%s", MSG_UTI_DAEMONIZE_TIMEOUT));
- break;
- }
- /* close read pipe */
-diff -up GE2011.11p1/source/libs/uti/sge_stdio.c.format GE2011.11p1/source/libs/uti/sge_stdio.c
---- GE2011.11p1/source/libs/uti/sge_stdio.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_stdio.c 2014-10-03 21:11:16.342852591 -0600
-@@ -409,7 +409,7 @@ pid_t sge_peopen_r(const char *shell, in
- DRETURN(-1);
- }
- } else {
-- ERROR((SGE_EVENT, MSG_UTI_MEMPWNAM));
-+ ERROR((SGE_EVENT, "%s", MSG_UTI_MEMPWNAM));
- FREE(buffer);
- if (sge_has_admin_user()) {
- sge_switch2admin_user();
-@@ -429,7 +429,7 @@ pid_t sge_peopen_r(const char *shell, in
-
- if (myuid != SGE_SUPERUSER_UID) {
- DPRINTF(("only root is allowed to switch to a different user\n"));
-- ERROR((SGE_EVENT, MSG_SYSTEM_NOROOTRIGHTSTOSWITCHUSER));
-+ ERROR((SGE_EVENT, "%s", MSG_SYSTEM_NOROOTRIGHTSTOSWITCHUSER));
- FREE(buffer);
- DRETURN(-2);
- }
-diff -up GE2011.11p1/source/libs/uti/sge_stdlib.c.format GE2011.11p1/source/libs/uti/sge_stdlib.c
---- GE2011.11p1/source/libs/uti/sge_stdlib.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_stdlib.c 2014-10-03 21:11:16.342852591 -0600
-@@ -74,7 +74,7 @@ char *sge_malloc(int size)
-
- cp = (char *) malloc(size);
- if (!cp) {
-- CRITICAL((SGE_EVENT, MSG_MEMORY_MALLOCFAILED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_MALLOCFAILED));
- DEXIT_;
- abort();
- }
-@@ -117,7 +117,7 @@ void *sge_realloc(void *ptr, int size, i
-
- cp = realloc(ptr, size);
- if (cp == NULL) {
-- CRITICAL((SGE_EVENT, MSG_MEMORY_REALLOCFAILED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_MEMORY_REALLOCFAILED));
- if (do_abort) {
- DEXIT;
- abort();
-diff -up GE2011.11p1/source/libs/uti/sge_string.c.format GE2011.11p1/source/libs/uti/sge_string.c
---- GE2011.11p1/source/libs/uti/sge_string.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_string.c 2014-10-03 21:11:16.342852591 -0600
-@@ -387,7 +387,7 @@ char *sge_strtok_r(const char *str, cons
-
- if (str != NULL) {
- if (*context != NULL) {
-- ERROR((SGE_EVENT, MSG_POINTER_INVALIDSTRTOKCALL));
-+ ERROR((SGE_EVENT, "%s", MSG_POINTER_INVALIDSTRTOKCALL));
- }
- *context = (struct saved_vars_s *)malloc(sizeof(struct saved_vars_s));
- memset(*context, 0, sizeof(struct saved_vars_s));
-@@ -399,7 +399,7 @@ char *sge_strtok_r(const char *str, cons
- saved_cp = saved->static_str;
- } else {
- if (*context == NULL) {
-- ERROR((SGE_EVENT, MSG_POINTER_INVALIDSTRTOKCALL1));
-+ ERROR((SGE_EVENT, "%s", MSG_POINTER_INVALIDSTRTOKCALL1));
- DRETURN(NULL);
- }
- saved = *context;
-diff -up GE2011.11p1/source/libs/uti/sge_uidgid.c.format GE2011.11p1/source/libs/uti/sge_uidgid.c
---- GE2011.11p1/source/libs/uti/sge_uidgid.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_uidgid.c 2014-10-03 21:11:16.343852615 -0600
-@@ -242,7 +242,7 @@ int sge_set_admin_username(const char *u
- }
- if (!user || user[0] == '\0') {
- if (err_str) {
-- sprintf(err_str, MSG_POINTER_SETADMINUSERNAMEFAILED);
-+ sprintf(err_str, "%s", MSG_POINTER_SETADMINUSERNAMEFAILED);
- }
- DEXIT;
- return -1;
-@@ -353,7 +353,7 @@ int sge_switch2admin_user(void)
- DENTER(UIDGID_LAYER, "sge_switch2admin_user");
-
- if (get_admin_user(&uid, &gid) == ESRCH) {
-- CRITICAL((SGE_EVENT, MSG_SWITCH_USER_NOT_INITIALIZED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_INITIALIZED));
- abort();
- }
-
-@@ -425,7 +425,7 @@ int sge_switch2start_user(void)
- DENTER(UIDGID_LAYER, "sge_switch2start_user");
-
- if (get_admin_user(&uid, &gid) == ESRCH) {
-- CRITICAL((SGE_EVENT, MSG_SWITCH_USER_NOT_INITIALIZED));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SWITCH_USER_NOT_INITIALIZED));
- abort();
- }
-
-@@ -979,7 +979,7 @@ static int _sge_set_uid_gid_addgrp(const
- sge_switch2start_user();
-
- if (!sge_is_start_user_superuser()) {
-- sprintf(err_str, MSG_SYSTEM_CHANGEUIDORGIDFAILED );
-+ sprintf(err_str, "%s", MSG_SYSTEM_CHANGEUIDORGIDFAILED );
- return -1;
- }
-
-diff -up GE2011.11p1/source/libs/uti/sge_unistd.c.format GE2011.11p1/source/libs/uti/sge_unistd.c
---- GE2011.11p1/source/libs/uti/sge_unistd.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/sge_unistd.c 2014-10-03 21:11:16.343852615 -0600
-@@ -157,7 +157,7 @@ bool sge_unlink(const char *prefix, cons
- DENTER(TOP_LAYER, "sge_unlink");
-
- if (!suffix) {
-- ERROR((SGE_EVENT, MSG_POINTER_SUFFIXISNULLINSGEUNLINK ));
-+ ERROR((SGE_EVENT, "%s", MSG_POINTER_SUFFIXISNULLINSGEUNLINK ));
- DEXIT;
- return false;
- }
-@@ -349,11 +349,11 @@ int sge_mkdir(const char *path, int fmod
- DENTER(TOP_LAYER, "sge_mkdir");
- if (!path) {
- if (exit_on_error) {
-- CRITICAL((SGE_EVENT,MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DCLOSE;
- SGE_EXIT(NULL, 1);
- } else {
-- ERROR((SGE_EVENT, MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ ERROR((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DEXIT;
- return -1;
- }
-@@ -394,11 +394,11 @@ int sge_mkdir2(const char *base_dir, con
-
- if (base_dir == NULL || name == NULL) {
- if (exit_on_error) {
-- CRITICAL((SGE_EVENT,MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ CRITICAL((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DCLOSE;
- SGE_EXIT(NULL, 1);
- } else {
-- ERROR((SGE_EVENT, MSG_VAR_PATHISNULLINSGEMKDIR ));
-+ ERROR((SGE_EVENT, "%s", MSG_VAR_PATHISNULLINSGEMKDIR ));
- DRETURN(-1);
- }
- }
-diff -up GE2011.11p1/source/libs/uti/test_sge_profiling.c.format GE2011.11p1/source/libs/uti/test_sge_profiling.c
---- GE2011.11p1/source/libs/uti/test_sge_profiling.c.format 2012-05-23 13:04:41.000000000 -0600
-+++ GE2011.11p1/source/libs/uti/test_sge_profiling.c 2014-10-03 21:11:16.344852638 -0600
-@@ -118,25 +118,25 @@ int do_test () {
- /* if (thread_prof_active_by_id(pthread_self()) == true ) {*/
-
- if(!prof_start(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "Main Loop", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_OTHER, "other", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -180,7 +180,7 @@ int do_test () {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_reset(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -189,13 +189,13 @@ int do_test () {
- printf("%s\n", prof_get_info_string(SGE_PROF_CUSTOM1, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_stop(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -214,31 +214,31 @@ void* do_sleep(void* p) {
- /* if (thread_prof_active_by_id(pthread_self()) == true ) {*/
-
- if(!prof_start(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_start(SGE_PROF_CUSTOM2, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "sleep thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM2, "sleep_thread_printf", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -261,19 +261,19 @@ void* do_sleep(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_stop(SGE_PROF_CUSTOM2, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_stop(SGE_PROF_OTHER, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -293,13 +293,13 @@ void* do_calc(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) { */
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "calc thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -327,7 +327,7 @@ void* do_calc(void* p) {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -348,13 +348,13 @@ void* do_calc2(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "calc2 thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -373,7 +373,7 @@ void* do_calc2(void* p) {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -395,13 +395,13 @@ void* do_malloc(void* p) {
-
- /*if (thread_prof_active_by_id(pthread_self()) == true ) {*/
- if(!prof_start(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-
- if(!prof_set_level_name(SGE_PROF_CUSTOM1, "malloc thread", &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-@@ -419,7 +419,7 @@ void* do_malloc(void* p) {
- printf("%s\n", prof_get_info_string(SGE_PROF_ALL, false, &error));
-
- if(!prof_stop(SGE_PROF_CUSTOM1, &error)) {
-- fprintf(stderr, sge_dstring_get_string(&error)); fflush(stderr);
-+ fprintf(stderr, "%s", sge_dstring_get_string(&error)); fflush(stderr);
- fprintf(stderr, "\n");
- sge_dstring_clear(&error);
- }
-diff -up GE2011.11p1/source/utilbin/authuser.c.format GE2011.11p1/source/utilbin/authuser.c
---- GE2011.11p1/source/utilbin/authuser.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/authuser.c 2014-10-03 21:11:16.344852638 -0600
-@@ -158,7 +158,7 @@ static void usage(void) {
- static void print_error(const char* format, ...) {
- va_list ap;
- va_start(ap, format);
-- fprintf(stderr, MSG_AUTHUSER_ERROR);
-+ fprintf(stderr, "%s", MSG_AUTHUSER_ERROR);
- vfprintf(stderr, format, ap);
- fprintf(stderr, "\n");
- va_end(ap);
-diff -up GE2011.11p1/source/utilbin/checkprog.c.format GE2011.11p1/source/utilbin/checkprog.c
---- GE2011.11p1/source/utilbin/checkprog.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/checkprog.c 2014-10-03 21:11:16.345852661 -0600
-@@ -58,7 +58,7 @@ int i
- void usage_checkprog(void)
- {
- fprintf(stderr, "\n");
-- fprintf(stderr, MSG_COMMAND_USAGECHECKPROG);
-+ fprintf(stderr,"%s", MSG_COMMAND_USAGECHECKPROG);
- fprintf(stderr, "\n");
- /*fprintf(stderr, "check the first 8 letters of process basename\n\n");
- fprintf(stderr, "exit status: 0 if process was found\n");
-@@ -71,7 +71,7 @@ void usage_checkprog(void)
- void usage_getprogs(void)
- {
- fprintf(stderr, "\n");
-- fprintf(stderr,MSG_COMMAND_USAGEGETPROGS );
-+ fprintf(stderr,"%s", MSG_COMMAND_USAGEGETPROGS );
- fprintf(stderr, "\n");
- /*
- fprintf(stderr, "check and list pids of \"processname\"\n\n");
-@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
- else if (!strcmp(ptr, "getprogs"))
- checkit = 0;
- else {
-- fprintf(stderr, MSG_COMMAND_CALLCHECKPROGORGETPROGS );
-+ fprintf(stderr, "%s", MSG_COMMAND_CALLCHECKPROGORGETPROGS );
- fprintf(stderr, "\n");
- exit(1);
- }
-@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
- else if (res == 0)
- printf(MSG_PROC_PIDISRUNNINGWITHNAME_IS , (int) pid, argv[2]);
- else if (res == -1)
-- printf(MSG_COMMAND_SPANPSFAILED );
-+ printf("%s", MSG_COMMAND_SPANPSFAILED );
-
- if (res == -1)
- res = 2;
-diff -up GE2011.11p1/source/utilbin/gethostbyaddr.c.format GE2011.11p1/source/utilbin/gethostbyaddr.c
---- GE2011.11p1/source/utilbin/gethostbyaddr.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/gethostbyaddr.c 2014-10-03 21:11:16.345852661 -0600
-@@ -212,13 +212,13 @@ int main(int argc, char *argv[])
- }
-
- if (he != NULL) {
-- printf(MSG_SYSTEM_ALIASES );
-+ printf("%s", MSG_SYSTEM_ALIASES );
-
- for (tp = he->h_aliases; *tp; tp++)
- printf("%s ", *tp);
- printf("\n");
-
-- printf(MSG_SYSTEM_ADDRESSES );
-+ printf("%s", MSG_SYSTEM_ADDRESSES );
-
- for (tp2 = he->h_addr_list; *tp2; tp2++)
- printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */
-diff -up GE2011.11p1/source/utilbin/gethostbyname.c.format GE2011.11p1/source/utilbin/gethostbyname.c
---- GE2011.11p1/source/utilbin/gethostbyname.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/gethostbyname.c 2014-10-03 21:11:16.345852661 -0600
-@@ -157,13 +157,13 @@ int main(int argc, char *argv[]) {
- printf("SGE name: %s\n",resolved_name);
- }
-
-- printf(MSG_SYSTEM_ALIASES );
-+ printf("%s", MSG_SYSTEM_ALIASES );
-
- for (tp = he->h_aliases; *tp; tp++)
- printf("%s ", *tp);
- printf("\n");
-
-- printf(MSG_SYSTEM_ADDRESSES );
-+ printf("%s", MSG_SYSTEM_ADDRESSES );
- for (tp2 = he->h_addr_list; *tp2; tp2++)
- printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */
- printf("\n");
-diff -up GE2011.11p1/source/utilbin/gethostname.c.format GE2011.11p1/source/utilbin/gethostname.c
---- GE2011.11p1/source/utilbin/gethostname.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/gethostname.c 2014-10-03 21:11:16.345852661 -0600
-@@ -149,13 +149,13 @@ int main(int argc,char *argv[]) {
- printf("SGE name: %s\n",resolved_name);
- }
-
-- printf(MSG_SYSTEM_ALIASES );
-+ printf("%s", MSG_SYSTEM_ALIASES );
-
- for (tp = he->h_aliases; *tp; tp++)
- printf("%s ", *tp);
- printf("\n");
-
-- printf(MSG_SYSTEM_ADDRESSES );
-+ printf("%s", MSG_SYSTEM_ADDRESSES );
- for (tp2 = he->h_addr_list; *tp2; tp2++)
- printf("%s ", inet_ntoa(* (struct in_addr *) *tp2)); /* inet_ntoa() is not MT save */
- printf("\n");
-diff -up GE2011.11p1/source/utilbin/loadcheck.c.format GE2011.11p1/source/utilbin/loadcheck.c
---- GE2011.11p1/source/utilbin/loadcheck.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/loadcheck.c 2014-10-03 21:11:16.346852685 -0600
-@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
- memset(&mem_info, 0, sizeof(sge_mem_info_t));
- if (sge_loadmem(&mem_info))
- {
-- fprintf(stderr, MSG_SYSTEM_RETMEMORYINDICESFAILED );
-+ fprintf(stderr, "%s", MSG_SYSTEM_RETMEMORYINDICESFAILED );
- fprintf(stderr, "\n");
- #ifndef WINDOWS
- DEXIT;
-diff -up GE2011.11p1/source/utilbin/qping.c.format GE2011.11p1/source/utilbin/qping.c
---- GE2011.11p1/source/utilbin/qping.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/qping.c 2014-10-03 21:11:16.346852685 -0600
-@@ -365,7 +365,7 @@ static void qping_print_line(const char*
- help[0]=0;
- if (help2) {
- snprintf(help_buffer,1024,"%s%s", cl_values[1], help2);
-- snprintf(cl_values[1],1024, help_buffer);
-+ snprintf(cl_values[1],1024, "%s", help_buffer);
- }
- }
-
-@@ -376,7 +376,7 @@ static void qping_print_line(const char*
- help[0]=0;
- if (help2) {
- snprintf(help_buffer,1024,"%s%s", cl_values[3], help2);
-- snprintf(cl_values[3],1024, help_buffer);
-+ snprintf(cl_values[3],1024, "%s", help_buffer);
- }
- }
-
-diff -up GE2011.11p1/source/utilbin/sge_passwd.c.format GE2011.11p1/source/utilbin/sge_passwd.c
---- GE2011.11p1/source/utilbin/sge_passwd.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/sge_passwd.c 2014-10-03 21:11:16.347852708 -0600
-@@ -295,7 +295,7 @@ sge_get_file_pub_key(void)
- const char *cert = getenv("SGE_CERTFILE");
-
- if (cert != NULL) {
-- snprintf(file, 4096, cert);
-+ snprintf(file, 4096, "%s", cert);
- } else {
- const char *sge_root = sge_get_root_dir(0, NULL, 0, 1);
- const char *sge_cell = sge_get_default_cell();
-@@ -655,7 +655,7 @@ buffer_decrypt(const char *buffer_in, si
- snprintf(err_str, MAX_STRING_SIZE, MSG_PWD_LOAD_PRIV_SSS,
- SGE_PASSWD_PROG_NAME, file_priv_key, err_msg);
- #ifdef DEFINE_SGE_PASSWD_MAIN
-- fprintf(stderr, err_str);
-+ fprintf(stderr, "%s", err_str);
- #endif
- DEXIT;
- return 1;
-@@ -685,7 +685,7 @@ buffer_decrypt(const char *buffer_in, si
- snprintf(err_str, MAX_STRING_SIZE, MSG_PWD_MALLOC_SS,
- SGE_PASSWD_PROG_NAME, err_msg);
- #ifdef DEFINE_SGE_PASSWD_MAIN
-- fprintf(stderr, err_str);
-+ fprintf(stderr, "%s", err_str);
- #endif
- DEXIT;
- return 1;
-@@ -1198,7 +1198,7 @@ sge_passwd_add_change(const char *userna
- password_write_file(users, encryped_pwd,
- sge_get_file_dotpasswd(), sge_get_file_passwd());
- DPRINTF(("password table has been written\n"));
-- fprintf(stdout, MSG_PWD_CHANGED);
-+ fprintf(stdout, "%s", MSG_PWD_CHANGED);
- fprintf(stdout, "\n");
- DEXIT;
- }
-diff -up GE2011.11p1/source/utilbin/spooldefaults.c.format GE2011.11p1/source/utilbin/spooldefaults.c
---- GE2011.11p1/source/utilbin/spooldefaults.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/spooldefaults.c 2014-10-03 21:11:16.347852708 -0600
-@@ -113,13 +113,13 @@ static int init_framework(sge_gdi_ctx_cl
- spooling_params);
- answer_list_output(&answer_list);
- if (spooling_context == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
- } else {
- spool_set_default_context(spooling_context);
-
- /* initialize spooling context */
- if (!spool_startup_context(&answer_list, spooling_context, true)) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
- } else {
- ret = EXIT_SUCCESS;
- }
-diff -up GE2011.11p1/source/utilbin/spooledit.c.format GE2011.11p1/source/utilbin/spooledit.c
---- GE2011.11p1/source/utilbin/spooledit.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/spooledit.c 2014-10-03 21:11:16.347852708 -0600
-@@ -97,9 +97,9 @@ init_framework(sge_gdi_ctx_class_t *ctx,
- spooling_params);
- answer_list_output(&answer_list);
- if (!strcmp(bootstrap_get_spooling_method(),"classic")) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANTHANDLECLASSICSPOOLING));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANTHANDLECLASSICSPOOLING));
- } else if (spooling_context == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
- } else {
- spool_set_default_context(spooling_context);
- spool_set_option(&answer_list, spooling_context, "recover=false");
-@@ -107,7 +107,7 @@ init_framework(sge_gdi_ctx_class_t *ctx,
-
- /* initialize spooling context */
- if (!spool_startup_context(&answer_list, spooling_context, true)) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
- } else {
- /* search the berkeley db info - take it from any object type,
- * berkeleydb spools all objects using the same rule.
-@@ -264,7 +264,7 @@ dump_object(bdb_info info, const char *k
- answer_list_output(&answer_list);
- ret = EXIT_FAILURE;
- } else {
-- printf(job_script);
-+ printf("%s", job_script);
- FREE(job_script);
- }
- } else {
-diff -up GE2011.11p1/source/utilbin/spoolinit.c.format GE2011.11p1/source/utilbin/spoolinit.c
---- GE2011.11p1/source/utilbin/spoolinit.c.format 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/utilbin/spoolinit.c 2014-10-03 21:11:16.347852708 -0600
-@@ -83,14 +83,14 @@ static int init_framework(const char *me
- libargs);
- answer_list_output(&answer_list);
- if (spooling_context == NULL) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTCREATECONTEXT));
- } else {
- spool_set_default_context(spooling_context);
-
- /* initialize spooling context */
- if (!spool_startup_context(&answer_list, spooling_context,
- check_context)) {
-- CRITICAL((SGE_EVENT, MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
-+ CRITICAL((SGE_EVENT, "%s", MSG_SPOOLDEFAULTS_CANNOTSTARTUPCONTEXT));
- } else {
- ret = EXIT_SUCCESS;
- }
diff --git a/gridengine-ldflags.patch b/gridengine-ldflags.patch
deleted file mode 100644
index a82955a..0000000
--- a/gridengine-ldflags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -up GE2011.11p1/source/aimk.ldflags GE2011.11p1/source/aimk
---- GE2011.11p1/source/aimk.ldflags 2012-05-23 13:05:00.000000000 -0600
-+++ GE2011.11p1/source/aimk 2013-05-21 09:41:04.639062331 -0600
-@@ -314,7 +314,7 @@ set JNI_TARGET = "ALL"
- set PROTECTED = 0
- set RUNPATH = ""
-
--set LFLAGS = "-L."
-+set LFLAGS = "$LDFLAGS -L."
- set XLFLAGS = ""
- set XLIBS = ""
- set XMLIBS = ""
-diff -up GE2011.11p1/source/clients/qmon/Makefile.ldflags GE2011.11p1/source/clients/qmon/Makefile
---- GE2011.11p1/source/clients/qmon/Makefile.ldflags 2012-05-23 13:04:47.000000000 -0600
-+++ GE2011.11p1/source/clients/qmon/Makefile 2013-05-21 12:00:46.266888889 -0600
-@@ -152,7 +152,7 @@ messages:
- # rules to build binaries
- ###############################################################################
- qmon: $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_LIB_DEPENDS)
-- $(LD_WRAPPER) $(CC) $(LFLAGS) $(LDFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS)
-+ $(LD_WRAPPER) $(CC) $(LFLAGS) $(XLFLAGS) -o $@ $(QMON_OBJS) $(QMON_ADD_OBJS) $(QMON_ADD_LIBS) $(XLIBS) $(SLIBS) $(LIBS)
-
- ############################################################################
- # ListTree Demo prog
---- GE2011.11p1/source/3rdparty/qtcsh/Makefile.in.ldflags 2012-05-23 13:04:53.000000000 -0600
-+++ GE2011.11p1/source/3rdparty/qtcsh/Makefile.in 2013-05-21 12:19:25.286578827 -0600
-@@ -335,19 +335,19 @@
-
- tcsh:$(P) ${OBJS}
- rm -f tcsh core
-- ${CC} -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
-+ ${CC} -o tcsh ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
-
- # Purify
- pure:$(P) ${OBJS}
- rm -f tcsh core
-- purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
-+ purify `echo ${CC} | sed -e s,-B/bin/,,` -o tcsh ${CFLAGS} ${CPPFLAGS} ${OBJS} ${LIBES} ${EXTRALIBS}
- # OS/2
- tcsh.exe: tcsh
- emxbind tcsh
-
- gethost: gethost.c sh.err.h tc.const.h sh.h
- rm -f gethost
-- ${CC} -o gethost ${LDFLAGS} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
-+ ${CC} -o gethost ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${EXTRAFLAGS} $(srcdir)/gethost.c ${LIBES} ${EXTRALIBS}
-
- tc.defs.c: gethost host.defs
- @rm -f $@
---- GE2011.11p1/source/3rdparty/qtcsh/configure.ldflags 2012-05-23 13:04:53.000000000 -0600
-+++ GE2011.11p1/source/3rdparty/qtcsh/configure 2013-05-21 15:53:06.286076742 -0600
-@@ -2691,7 +2691,7 @@
- fi;
- if test "$sge" != no; then
- GRDDEF="-I../../../libs/gdi"
-- GRDLIB="-L../../../$sge \$(SGE_LIBS) ${LDFLAGS}"
-+ GRDLIB="-L../../../$sge \$(SGE_LIBS)"
- CFLAGS="$CFLAGS -DPROG_NAME='\"qtcsh\"' -D$sge"
- fi
-
diff --git a/gridengine-loadsensor.patch b/gridengine-loadsensor.patch
deleted file mode 100644
index 13aba86..0000000
--- a/gridengine-loadsensor.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -up source/daemons/execd/sge_load_sensor.c.loadsensor source/daemons/execd/sge_load_sensor.c
---- source/daemons/execd/sge_load_sensor.c.loadsensor 2012-05-23 13:04:38.000000000 -0600
-+++ source/daemons/execd/sge_load_sensor.c 2012-10-03 15:10:46.129014819 -0600
-@@ -168,7 +168,7 @@ static int sge_ls_status(lListElem *this
- {
- fd_set writefds;
- int ret;
-- int higest_fd;
-+ int highest_fd;
-
- DENTER(TOP_LAYER, "sge_ls_status");
-
-@@ -178,11 +178,11 @@ static int sge_ls_status(lListElem *this
-
- /* build writefds */
- FD_ZERO(&writefds);
-- higest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-- FD_SET(higest_fd, &writefds);
-+ highest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-+ FD_SET(highest_fd, &writefds);
-
- /* is load sensor ready to read ? */
-- ret = select(higest_fd + 1, NULL, &writefds, NULL, NULL);
-+ ret = select(highest_fd + 1, NULL, &writefds, NULL, NULL);
-
- if (ret <= 0) {
- DRETURN(LS_BROKEN_PIPE);
-@@ -263,9 +263,6 @@ static int sge_ls_start_ls(const char *q
- DPRINTF(("%s: successfully started load sensor \"%s\"\n",
- SGE_FUNC, lGetString(this_ls, LS_command)));
-
-- /* request first load report after starting */
-- ls_send_command(this_ls, "\n");
--
- return LS_OK;
- }
-
-@@ -431,6 +428,11 @@ static int read_ls(void)
- char value[1000];
- lListElem *ls_elem;
- bool flag = true;
-+ fd_set readfds;
-+ struct timeval timeleft;
-+ int wait = 1;
-+ int highest_fd;
-+ int ret;
-
- DENTER(TOP_LAYER, "read_ls");
-
-@@ -441,10 +443,46 @@ static int read_ls(void)
- continue;
- }
-
-+ /* request load report from ls */
-+ ls_send_command(ls_elem, "\n");
-+
- DPRINTF(("receiving from %s\n", lGetString(ls_elem, LS_command)));
-
-+ highest_fd = fileno(file);
- while (flag) {
- if (fscanf(file, "%[^\n]\n", input) != 1) {
-+ FD_ZERO(&readfds);
-+ FD_SET(highest_fd, &readfds);
-+
-+ /* wait up to 1 second per line for reading report */
-+ timeleft.tv_sec = wait;
-+ timeleft.tv_usec = 0;
-+ ret = select(highest_fd + 1, &readfds, NULL, NULL, &timeleft);
-+ if (ret == -1) {
-+ switch (errno) {
-+ case EINTR:
-+ DPRINTF(("select failed with EINTR\n"));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EINTR", lGetString(ls_elem, LS_pid)));
-+ break;
-+ case EBADF:
-+ DPRINTF(("select failed with EBADF\n"));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EBADF", lGetString(ls_elem, LS_pid)));
-+ break;
-+ case EINVAL:
-+ DPRINTF(("select failed with EINVAL\n"));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with EINVAL", lGetString(ls_elem, LS_pid)));
-+ break;
-+ default:
-+ DPRINTF(("select failed with unexpected errno %d", errno));
-+ WARNING((SGE_EVENT, "[load_sensor %s] read select failed with [%s]", lGetString(ls_elem, LS_pid), strerror(errno)));
-+ }
-+ DRETURN(-1);
-+ }
-+
-+ /* if something is there now, go back and read it */
-+ if (ret) continue;
-+
-+ /* nothing to read, so exit */
- break;
- }
- #ifdef INTERIX
-@@ -467,9 +505,9 @@ static int read_ls(void)
- lXchgList(ls_elem, LS_complete, &tmp_list);
- lFreeList(&tmp_list);
-
-- /* request next load report from ls */
-- ls_send_command(ls_elem, "\n");
-- break;
-+ /* see without waiting if there is any backlog to process, we'll exit if fscanf fails */
-+ wait = 0;
-+ continue;
- }
-
- /* add a newline for pattern matching in sscanf */
-@@ -524,19 +562,19 @@ static int ls_send_command(lListElem *th
- struct timeval timeleft;
- int ret;
- FILE *file;
-- int higest_fd;
-+ int highest_fd;
-
- DENTER(TOP_LAYER, "ls_send_command");
-
- FD_ZERO(&writefds);
-- higest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-- FD_SET(higest_fd, &writefds);
-+ highest_fd = fileno((FILE *) lGetRef(this_ls, LS_in));
-+ FD_SET(highest_fd, &writefds);
-
- timeleft.tv_sec = 0;
- timeleft.tv_usec = 0;
-
- /* wait for writing on fd_in */
-- ret = select(higest_fd + 1, NULL, &writefds, NULL, &timeleft);
-+ ret = select(highest_fd + 1, NULL, &writefds, NULL, &timeleft);
- if (ret == -1) {
- switch (errno) {
- case EINTR:
diff --git a/gridengine-mingw.patch b/gridengine-mingw.patch
deleted file mode 100644
index de47b6b..0000000
--- a/gridengine-mingw.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up GE2011.11/source/aimk.mingw GE2011.11/source/aimk
---- GE2011.11/source/aimk.mingw 2012-03-21 15:04:40.985356138 -0600
-+++ GE2011.11/source/aimk 2012-03-21 15:35:53.436004441 -0600
-@@ -46,7 +46,7 @@ unsetenv AIMK_INSURE AIMK_TARGET_BITS ai
-
- set COMPILE_ARCH = ""
- set COMPILE_DIR = ""
--set buildarch = UNKNOWN
-+set buildarch = mingw32
- set WINCC = ""
- set WINCFLAGS = ""
- set WINLFLAGS = ""
-@@ -177,6 +177,7 @@ usage:
- echo " -kerberos -> enable kerberos authentication"
- echo " -man -> generate man pages"
- echo " -mankv -> generate man pages checked out with '-kv' flag"
-+ echo " -mingw32 -> compile with mingw32"
- echo " -mo -> generate the message catalogues (Solaris only)"
- echo " -no-core -> don't compile the core system"
- echo " -no-java -> don't compile Java[TM] class files"
-@@ -643,6 +644,10 @@ while ($#argv >= 1 && $?found)
- set BUILDMAN = 1
- set KVMAN = 1
- breaksw
-+ case "-mingw32":
-+ set buildarch = mingw32
-+ set BUILDARCH = `scripts/compilearch -b $buildarch`
-+ breaksw
- case "-mo"
- echo "BUILDARCH=$BUILDARCH"
- if ( $BUILDARCH == sol-sparc || $BUILDARCH == sol-sparc64 ) then
-@@ -1763,6 +1768,17 @@ case CYGWIN_X86:
-
- breaksw
-
-+case MINGW32:
-+ set WINCC = i686-pc-mingw32-gcc
-+ set HWLOC = 0
-+ set MAKEHWLOC = 0
-+ set DEPEND_FLAGS = "$CFLAGS"
-+ set RM = "rm -f"
-+ # Default build targets for WIN32_X86 for which we have seperate make files
-+ set MAKEWINGRIDLIB = 1
-+ set MAKEWINGRIDAPP = 1
-+ breaksw
-+
- case WIN32_X86:
- setenv LD_LIBRARY_PATH /usr/lib/x86:/usr/local/lib
- set CC = gcc
-diff -up GE2011.11/source/libs/comm/cl_data_types.h.mingw GE2011.11/source/libs/comm/cl_data_types.h
-diff -up GE2011.11/source/scripts/compilearch.mingw GE2011.11/source/scripts/compilearch
---- GE2011.11/source/scripts/compilearch.mingw 2012-03-21 15:04:40.657367886 -0600
-+++ GE2011.11/source/scripts/compilearch 2012-03-21 15:04:41.013355134 -0600
-@@ -228,6 +228,10 @@ case $buildarch in
- BUILDARCH=LINUXX64
- TARGET_BITS=TARGET_64BIT
- ;;
-+ mingw32)
-+ BUILDARCH=MINGW32
-+ TARGET_BITS=TARGET_32BIT
-+ ;;
- necsx4)
- BUILDARCH=NECSX4
- TARGET_BITS=TARGET_64BIT
diff --git a/gridengine-rctemplates.patch b/gridengine-rctemplates.patch
deleted file mode 100644
index fa8caac..0000000
--- a/gridengine-rctemplates.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-diff -up GE2011.11p1/source/dist/inst_sge.rctemplates GE2011.11p1/source/dist/inst_sge
---- GE2011.11p1/source/dist/inst_sge.rctemplates 2012-05-23 13:04:49.000000000 -0600
-+++ GE2011.11p1/source/dist/inst_sge 2012-07-09 14:11:10.645922508 -0600
-@@ -702,8 +702,7 @@ if [ "$UPDATE" = true ]; then
- AddJMXFiles
- fi
- RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
-- CreateSGEStartUpScripts $euid true master
-- CreateSGEStartUpScripts $euid true execd
-+ SetupDefaultUsers $euid
- CreateSettingsFile
- InitCA
- SetupRcScriptNames master #New qmaster RC script/SMF
-@@ -867,7 +866,6 @@ if [ "$BERKELEY" = "install" ]; then
- Makedir $COMMONDIR
- ProcessSGEClusterName "bdb"
- SetSpoolingOptions
-- AddSGEStartUpScript $euid "bdb"
- PrepareRPCServerStart
- GiveBerkelyHints
- else
-@@ -919,11 +917,9 @@ if [ "$QMASTER" = "install" -a "$UPDATE"
- AddDefaultUsersets
- AddCommonFiles
- AddJMXFiles
-- CreateSGEStartUpScripts $euid true master
-- CreateSGEStartUpScripts $euid true execd
-+ SetupDefaultUsers $euid
- CreateSettingsFile
- InitCA
-- AddSGEStartUpScript $euid master
- StartQmaster
- AddWindowsAdmin
- AddHosts
-@@ -1091,7 +1087,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
- GetLocalExecdSpoolDir
- AddLocalConfiguration_With_Qconf
- AddSubmitHostsExecd
-- AddSGEStartUpScript $euid execd
- SetupWinSvc execinst #service install during execd installation -> param: execinst
- # CopyIBMLoadSensor
- StartExecd
-@@ -1127,7 +1122,6 @@ if [ "$EXECD" = "install" -a "$UPDATE" !
- CheckHostNameResolving install
- GetLocalExecdSpoolDir
- AddLocalConfiguration_With_Qconf
-- AddSGEStartUpScript $euid execd
- SetupWinSvc execinst #service install during execd installation -> param: execinst
- # CopyIBMLoadSensor
- StartExecd
-@@ -1444,7 +1438,6 @@ if [ $SHADOW = "install" ]; then
- if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
- . $SGE_ROOT/$SGE_CELL/common/settings.sh
- SGE_ARCH=`$SGE_ROOT/util/arch`
-- AddSGEStartUpScript $euid shadow
- $INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
- $INFOTEXT -log "Starting sge_shadowd on host %s\n" $SHADOW_HOST
- if [ "$SGE_ENABLE_SMF" = "true" ]; then
-@@ -1690,20 +1683,7 @@ if [ $MAKE_RC = "true" ]; then
-
- COMMONDIR=$SGE_CELL/common
-
-- CreateSGEStartUpScripts 0 true master
-- CreateSGEStartUpScripts 0 true execd
--
-- $INFOTEXT "\nYour new startup scripts are created. You will find them in the\n" \
-- "directory:\n\n" \
-- " %s\n\n" \
-- "Your old startup scripts are saved in this directory as\n\n" \
-- " %s\n" \
-- " %s\n\n" \
-- \$SGE_ROOT/$COMMONDIR sgemaster_$DATE sgeexecd_$DATE
--
-- $INFOTEXT "Please now copy the new startup scripts to the system wide rc\n" \
-- "file location on all qmaster, shadowd and execution hosts."
--
-+ SetupDefaultUser 0
- fi
-
- exit 0
-diff -up GE2011.11p1/source/dist/util/create_settings.sh.rctemplates GE2011.11p1/source/dist/util/create_settings.sh
---- GE2011.11p1/source/dist/util/create_settings.sh.rctemplates 2012-05-23 13:04:48.000000000 -0600
-+++ GE2011.11p1/source/dist/util/create_settings.sh 2012-07-09 14:14:11.614473681 -0600
-@@ -67,8 +67,6 @@ SP_SH=$1/settings.sh
- echo "setenv SGE_ROOT $SGE_ROOT" > $SP_CSH
- echo "" >> $SP_CSH
- echo "set ARCH = \`\$SGE_ROOT/util/arch\`" >> $SP_CSH
--echo "set DEFAULTMANPATH = \`\$SGE_ROOT/util/arch -m\`" >> $SP_CSH
--echo "set MANTYPE = \`\$SGE_ROOT/util/arch -mt\`" >> $SP_CSH
- echo "" >> $SP_CSH
-
- #if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then
-@@ -93,31 +91,9 @@ fi
-
-
- echo "" >> $SP_CSH
--echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_CSH
--echo 'if ( $?MANPATH == 1 ) then' >> $SP_CSH
--echo " setenv MANPATH \$SGE_ROOT/"'${MANTYPE}':'$MANPATH' >> $SP_CSH
--echo "else" >> $SP_CSH
--echo " setenv MANPATH \$SGE_ROOT/"'${MANTYPE}:$DEFAULTMANPATH' >> $SP_CSH
--echo "endif" >> $SP_CSH
--echo "" >> $SP_CSH
- echo "set path = ( \$SGE_ROOT/bin/"'$ARCH $path )' >> $SP_CSH
-
--echo 'switch ($ARCH)' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo 'case "sol*":' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo 'case "linux-*":' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo 'case "hp11-64":' >> $SP_CSH
--#ENFORCE_SHLIBPATH#echo ' breaksw' >> $SP_CSH
--echo 'case "*":' >> $SP_CSH
--echo " set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`" >> $SP_CSH
--echo " if ( \`eval echo '\$?'\$shlib_path_name\` ) then" >> $SP_CSH
--echo " set old_value = \`eval echo '\$'\$shlib_path_name\`" >> $SP_CSH
--echo " setenv \$shlib_path_name \"\$SGE_ROOT/lib/\$ARCH\":\"\$old_value\"" >> $SP_CSH
--echo " else" >> $SP_CSH
--echo " setenv \$shlib_path_name \$SGE_ROOT/lib/\$ARCH" >> $SP_CSH
--echo " endif" >> $SP_CSH
--echo " unset shlib_path_name old_value" >> $SP_CSH
--echo "endsw" >> $SP_CSH
--echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_CSH
-+echo "unset ARCH" >> $SP_CSH
-
- #
- # bourne shell settings file
-@@ -126,8 +102,6 @@ echo "unset ARCH DEFAULTMANPATH MANTYPE"
- echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT" > $SP_SH
- echo "" >> $SP_SH
- echo "ARCH=\`\$SGE_ROOT/util/arch\`" >> $SP_SH
--echo "DEFAULTMANPATH=\`\$SGE_ROOT/util/arch -m\`" >> $SP_SH
--echo "MANTYPE=\`\$SGE_ROOT/util/arch -mt\`" >> $SP_SH
- echo "" >> $SP_SH
-
- if [ "$SGE_CELL" != "" ]; then
-@@ -151,28 +125,7 @@ fi
-
-
- echo "" >> $SP_SH
--echo "if [ \"\$MANPATH\" = \"\" ]; then" >> $SP_SH
--echo " MANPATH=\$DEFAULTMANPATH" >> $SP_SH
--echo "fi" >> $SP_SH
--echo "MANPATH=\$SGE_ROOT/\$MANTYPE:\$MANPATH; export MANPATH" >> $SP_SH
--echo "" >> $SP_SH
- echo "PATH=\$SGE_ROOT/bin/\$ARCH:\$PATH; export PATH" >> $SP_SH
-
--echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
--echo 'case $ARCH in' >> $SP_SH
--#ENFORCE_SHLIBPATH#echo 'sol*|linux-*|hp11-64)' >> $SP_SH
--#ENFORCE_SHLIBPATH#echo ' ;;' >> $SP_SH
--echo '*)' >> $SP_SH
--echo " shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`" >> $SP_SH
--echo " old_value=\`eval echo '\$'\$shlib_path_name\`" >> $SP_SH
--echo " if [ x\$old_value = "x" ]; then" >> $SP_SH
--echo " eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH" >> $SP_SH
--echo " else" >> $SP_SH
--echo " eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH:\$old_value" >> $SP_SH
--echo " fi" >> $SP_SH
--echo " export \$shlib_path_name" >> $SP_SH
--echo ' unset shlib_path_name old_value' >> $SP_SH
--echo ' ;;' >> $SP_SH
--echo 'esac' >> $SP_SH
--echo "unset ARCH DEFAULTMANPATH MANTYPE" >> $SP_SH
-+echo "unset ARCH" >> $SP_SH
-
-diff -up GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_common.sh
---- GE2011.11p1/source/dist/util/install_modules/inst_common.sh.rctemplates 2012-07-09 14:11:10.565925359 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_common.sh 2012-07-09 14:11:10.650922330 -0600
-@@ -576,19 +576,16 @@ ErrUsage()
- #
- GetConfigFromFile()
- {
-- SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF
-- SGE_ENABLE_SMF=""
-+ SGE_ENABLE_SMF_LAST=$SGE_ENABLE_SMF
-+ SGE_ENABLE_SMF=""
-+
-+ if [ $FILE != "undef" ]; then
-+ $INFOTEXT "Reading configuration from file %s" $FILE
-+ . $FILE
-+ else
-+ $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file"
-+ fi
-
-- IFS="
--"
-- if [ $FILE != "undef" ]; then
-- $INFOTEXT "Reading configuration from file %s" $FILE
-- . $FILE
-- else
-- $INFOTEXT "No config file. Please, start the installation with\n a valid configuration file"
-- fi
-- IFS="
--"
- #-nosmf takes precedence over the value in the autoinstall template
- if [ "$SGE_ENABLE_SMF_LAST" = false ]; then
- SGE_ENABLE_SMF=false
-@@ -2373,20 +2370,28 @@ CreateSGEStartUpScripts()
-
- rm -f $TMP_SGE_STARTUP_FILE ${TMP_SGE_STARTUP_FILE}.0 ${TMP_SGE_STARTUP_FILE}.1
-
-- if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" -a $hosttype = "master" ]; then
-- AddDefaultManager root $ADMINUSER
-- AddDefaultOperator $ADMINUSER
-- elif [ $euid != 0 -a $hosttype = "master" ]; then
-- AddDefaultManager $USER
-- AddDefaultOperator $USER
-- fi
--
- $INFOTEXT "Creating >%s< script" $STARTUP_FILE_NAME
- fi
-
- }
-
-
-+#-------------------------------------------------------------------------
-+# SetupDefaultUsers: Add the default manager and operator
-+#
-+SetupDefaultUsers() {
-+ euid=$1
-+
-+ if [ $euid = 0 -a "$ADMINUSER" != default -a $QMASTER = "install" ]; then
-+ AddDefaultManager root $ADMINUSER
-+ AddDefaultOperator $ADMINUSER
-+ elif [ $euid != 0 ]; then
-+ AddDefaultManager $USER
-+ AddDefaultOperator $USER
-+ fi
-+}
-+
-+
- #-------------------------------------------------------------------------
- # AddSGEStartUpScript: Add startup script to rc files if root installs
- #
-diff -up GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_execd.sh
---- GE2011.11p1/source/dist/util/install_modules/inst_execd.sh.rctemplates 2012-07-09 14:11:10.574925038 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_execd.sh 2012-07-09 14:11:10.651922294 -0600
-@@ -457,7 +457,7 @@ StartExecd()
- exit 1
- fi
- else
-- $SGE_STARTUP_FILE
-+ /sbin/service sge_execd start
- fi
- $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
- $CLEAR
-diff -up GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh
---- GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh.rctemplates 2012-07-09 14:11:10.597924218 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_qmaster.sh 2012-07-09 14:11:10.653922222 -0600
-@@ -208,8 +208,8 @@ GetQmasterSpoolDir()
- "the qmaster daemon on other hosts (see the corresponding section in the\n" \
- "Grid Engine Installation and Administration Manual for details) the account\n" \
- "on the shadow master hosts also needs read/write access to this directory.\n\n" \
-- "Enter a qmaster spool directory [%s] >> " "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"
-- QMDIR=`Enter "$SGE_ROOT_VAL/$SGE_CELL_VAL/spool/qmaster"`
-+ "Enter a qmaster spool directory [%s] >> " "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"
-+ QMDIR=`Enter "/var/spool/gridengine/$SGE_CELL_VAL/spool/qmaster"`
- done=true
- #If directory is not empty need now require a new one
- if [ -d "$QMDIR" ]; then
-@@ -747,6 +747,9 @@ AddBootstrap()
- ExecuteAsAdmin chmod 666 $COMMONDIR/bootstrap
- PrintBootstrap >> $COMMONDIR/bootstrap
- ExecuteAsAdmin chmod 444 $COMMONDIR/bootstrap
-+ rm -f /etc/sysconfig/gridengine
-+ echo "SGE_ROOT=/usr/share/gridengine" >> /etc/sysconfig/gridengine
-+ echo "SGE_CELL=$SGE_CELL" >> /etc/sysconfig/gridengine
- }
-
- #-------------------------------------------------------------------------
-@@ -963,7 +966,7 @@ GetConfiguration()
- fi
-
- if [ -z "$1" ]; then
-- default_value=$SGE_ROOT_VAL/$SGE_CELL_VAL/spool
-+ default_value=/var/spool/gridengine/$SGE_CELL_VAL
- else
- default_value="$1"
- fi
-@@ -1206,6 +1209,7 @@ InitSysKs()
- touch /tmp/pwfile.$$
- chmod 600 /tmp/pwfile.$$
- echo "$SGE_JMX_SSL_KEYSTORE_PW" > /tmp/pwfile.$$
-+ ExecuteAsAdmin mkdir -p `dirname $SGE_JMX_SSL_KEYSTORE`
- OUTPUT=`$SGE_CA_CMD -sysks -ksout $SGE_JMX_SSL_KEYSTORE -kspwf /tmp/pwfile.$$ 2>&1`
- if [ $? != 0 ]; then
- $INFOTEXT "Error: Cannot create keystore $SGE_JMX_SSL_KEYSTORE\n$OUTPUT"
-@@ -1277,7 +1281,7 @@ StartQmaster()
- exit 1
- fi
- else
-- $SGE_STARTUP_FILE -qmaster
-+ /sbin/service sgemaster start
- if [ $? -ne 0 ]; then
- $INFOTEXT "sge_qmaster start problem"
- $INFOTEXT -log "sge_qmaster start problem"
-diff -up GE2011.11p1/source/scripts/distinst.rctemplates GE2011.11p1/source/scripts/distinst
---- GE2011.11p1/source/scripts/distinst.rctemplates 2012-05-23 13:04:39.000000000 -0600
-+++ GE2011.11p1/source/scripts/distinst 2012-07-09 14:11:10.655922152 -0600
-@@ -839,15 +839,9 @@ if [ $instcommon = true ]; then
- Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
- if [ $enforce_shlibpath = true ]; then
- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
- Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
- else
- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
- Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
- fi
-
-@@ -872,7 +866,6 @@ if [ $instcommon = true ]; then
-
- Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
- $DEST_SGE_ROOT/util/upgrade_modules \
-- $DEST_SGE_ROOT/util/rctemplates \
- $DEST_SGE_ROOT/util/resources \
- $DEST_SGE_ROOT/util/sgeCA \
- $DEST_SGE_ROOT/util/resources/calendars \
-@@ -897,7 +890,6 @@ if [ $instcommon = true ]; then
- $DEST_SGE_ROOT/util/resources/starter_methods/*
-
- Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
-- $DEST_SGE_ROOT/util/rctemplates/* \
- $DEST_SGE_ROOT/util/sgeCA/*.cnf \
- $DEST_SGE_ROOT/util/sgeSMF/*.xml \
- $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
---- GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh.rctemplates 2012-05-23 13:04:48.000000000 -0600
-+++ GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh 2012-07-09 16:50:24.230166313 -0600
-@@ -281,11 +281,6 @@
- $INFOTEXT "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR
- $INFOTEXT -log "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR
- ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
--
-- if [ `ls -la $SPOOL_DIR | wc -l` -lt 4 ]; then
-- Removedir $SPOOL_DIR
-- fi
--
- fi
-
- $INFOTEXT "Checking local spooldir configuration for host \"%s\"!" $exechost
-@@ -305,9 +300,6 @@
- $INFOTEXT "Removing local spool directory [%s]" "$SPOOL_DIR/$HOST_DIR"
- $INFOTEXT -log "Removing local spool directory [%s]" "$SPOOL_DIR/$HOST_DIR"
- ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
-- if [ `ls -la $SPOOL_DIR | wc -l` -lt 4 ]; then
-- ExecuteAsAdmin rm -R $SPOOL_DIR
-- fi
- fi
- fi
- }
diff --git a/gridengine-rpath.patch b/gridengine-rpath.patch
deleted file mode 100644
index 860d4ff..0000000
--- a/gridengine-rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up GE2011.11/source/aimk.rpath GE2011.11/source/aimk
---- GE2011.11/source/aimk.rpath 2012-03-21 09:33:14.000000000 -0600
-+++ GE2011.11/source/aimk 2012-03-21 09:35:10.244582861 -0600
-@@ -1645,10 +1645,8 @@ case LINUX*:
-
- set JAVA_ARCH = "linux"
-
-- # due to -rpath relative_path the LD_LIBRARY_PATH not needed anymore
-- set RUNPATH = -Wl,-rpath,'\$$ORIGIN'/../../lib/$buildarch
-- set LFLAGS = "$LFLAGS $RUNPATH"
-- set SHARED_LFLAGS = "$SHARED_LFLAGS $RUNPATH"
-+ set LFLAGS = "$LFLAGS"
-+ set SHARED_LFLAGS = "$SHARED_LFLAGS"
-
- if ( $COMPILE_ARCH == "ULINUX86" || $COMPILE_ARCH == "ULINUXX64" ) then
- echo "Ignore jemalloc for unsupported architectures!"
diff --git a/gridengine.spec b/gridengine.spec
deleted file mode 100644
index 6e82b85..0000000
--- a/gridengine.spec
+++ /dev/null
@@ -1,973 +0,0 @@
-%global username sgeadmin
-%global homedir %{_datadir}/gridengine
-%global gecos Grid Engine
-%global _hardened_build 1
-
-# gridengine uses a versioned binary protocol to communicate between the master
-# and the nodes that needs to be the same on all machines in a cluster. This
-# version is defined by GRM_GDI_VERSION in: libs/gdi/version.c
-# No updates should be pushed that bump this version in a stable release.
-
-Name: gridengine
-Version: 2011.11p1
-Release: 34%{?dist}
-Summary: Grid Engine - Distributed Computing Management software
-
-Group: Applications/System
-# Only the file %{_libexecdir}/gridengine/bin/*/qmake is
-# under GPLv2+, which is not used or linked by other parts
-# of gridengine.
-# The file %{_libexecdir}/gridengine/bin/*/qtcsh is
-# under BSD with advertising,
-# which is not used or linked by other parts of gridengine.
-License: (BSD and LGPLv2+ and MIT and SISSL) and GPLv2+ and BSD with advertising
-URL: http://gridscheduler.sourceforge.net/
-Source0: http://downloads.sourceforge.net/gridscheduler/GE%{version}/GE%{version}....
-Source1: gridengine-ppc.tar.gz
-Source2: conf_defaults
-Source3: sge.csh
-Source4: sge.sh
-%if 0%{?fedora} || 0%{?rhel} >= 7
-Source5: sge_execd.service
-Source6: sgemaster.service
-Source7: sge_shadowd.service
-%else
-Source5: sge_execd
-Source6: sgemaster
-%endif
-Source8: Licenses
-Source9: gridengine.sysconfig
-Source10: libcore.c
-Source11: README
-Source12: maketarball
-# Make loadsensor reports fresh
-Patch0: gridengine-loadsensor.patch
-# Add LDFLAGS to LFLAGS used by aimk
-Patch1: gridengine-ldflags.patch
-# Fix format-security errors
-# https://bugzilla.redhat.com/show_bug.cgi?id=1037103
-Patch2: gridengine-format.patch
-# Try to support arm architecture
-Patch4: gridengine-arm.patch
-# Don't need to make rc files in inst_common.sh
-# Partially http://gridengine.sunsource.net/issues/show_bug.cgi?id=2780
-Patch10: gridengine-rctemplates.patch
-# Fixup sge_ca to use system openssl and java paths
-Patch11: gridengine-6.2u2_1-sge_ca.patch
-# Fixup jni paths
-Patch12: gridengine-6.2-jni.patch
-# Don't use rpaths
-Patch13: gridengine-rpath.patch
-# Fix issue with hostnames and localhost
-Patch14: gridengine-6.2u5-gethostname.patch
-
-# handle aarch64 properly
-Patch15: gridengine-add-aarch64.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch: ppc64
-
-BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
-BuildRequires: libXmu-devel, libXpm-devel
-BuildRequires: openmotif-devel
-BuildRequires: java-devel >= 1.6.0, javacc, ant-junit
-%if 0%{?rhel} && 0%{?rhel} <= 6
-BuildRequires: ant-nodeps
-%endif
-BuildRequires: elfutils-libelf-devel, net-tools
-BuildRequires: groff
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: hostname
-%endif
-BuildRequires: hwloc-devel
-BuildRequires: jemalloc-devel
-BuildRequires: perl-generators
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: systemd
-%endif
-Requires: binutils
-Requires: ncurses
-Requires(posttrans): /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
-Requires(pre): shadow-utils
-
-
-%description
-In a typical network that does not have distributed resource management
-software, workstations and servers are used from 5% to 20% of the time.
-Even technical servers are generally less than fully utilized. This
-means that there are a lot of cycles that can be used productively if
-only users know where they are, can capture them, and put them to work.
-
-Grid Engine finds a pool of idle resources and harnesses it
-productively, so an organization gets as much as five to ten times the
-usable power out of systems on the network. That can increase utilization
-to as much as 98%.
-
-Grid Engine software aggregates available compute resources and
-delivers compute power as a network service.
-
-These are the local files shared by both the qmaster and execd
-daemons. You must install this package in order to use any one of them.
-
-
-%package devel
-Summary: Gridengine development files
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-gridengine development headers and libraries.
-
-
-%package qmon
-Summary: Gridengine qmon monitor
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi
-
-%description qmon
-The qmon graphical grid engine monitor
-
-
-%package execd
-Summary: Gridengine execd program
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 7
-Requires(post): systemd
-Requires(postun): systemd
-Requires(preun): systemd
-%else
-Requires(post): /sbin/chkconfig
-Requires(postun): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-%endif
-Requires(postun): %{name} = %{version}-%{release}
-Requires(preun): %{name} = %{version}-%{release}
-
-%description execd
-Programs needed to run a grid engine execution host
-
-
-%package qmaster
-Summary: Gridengine qmaster programs
-Group: Development/Libraries
-License: BSD and LGPLv2+ and MIT and SISSL
-Requires: %{name} = %{version}-%{release}
-Requires: db4-utils
-%if 0%{?fedora} || 0%{?rhel} >= 7
-Requires(post): systemd
-Requires(postun): systemd
-Requires(preun): systemd
-%else
-Requires(post): /sbin/chkconfig
-Requires(postun): /sbin/service
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-%endif
-Requires(postun): %{name} = %{version}-%{release}
-Requires(preun): %{name} = %{version}-%{release}
-
-%description qmaster
-Programs needed to run a grid engine qmaster or shadowd host
-
-
-%prep
-%setup -q -n GE%{version} -a 1
-#Use system hwloc and jemalloc
-rm -r source/3rdparty/hwloc
-rm -r source/3rdparty/jemalloc
-#Copy Licenses and README file into build directory
-cp %SOURCE8 %SOURCE11 .
-#Remove unneeded shbangs
-sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
-%patch0 -p0 -b .loadsensor
-%patch1 -p1 -b .ldflags
-%patch2 -p1 -b .format
-%patch4 -p1 -b .arm
-%patch10 -p1 -b .rctemplates
-%patch11 -p1 -b .sge_ca
-%patch12 -p1 -b .jni
-%patch13 -p1 -b .rpath
-%patch14 -p1 -b .gethostname
-%patch15 -p1
-sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
-#Don't ship rctemplates
-rm -rf source/dist/util/rctemplates
-#Don't ship windows .bat scripts
-find source -name \*.bat | xargs rm
-#Fix permissions
-chmod +x source/dist/util/dl?.*sh
-chmod -x source/dist/util/dl.*sh
-find source -name \*.c | xargs chmod -x
-#Fix flags for qmake build
-find source/3rdparty/qmake source/3rdparty/qtcsh -name Makefile |
- xargs sed -i -e "/^CFLAGS *=/s:=:= $RPM_OPT_FLAGS:"
-#dlopen the runtime libssl library
-soname=$(objdump -p %{_libdir}/libssl.so | awk '/SONAME/ {print $2}')
-sed -i -e s/libssl\.so/$soname/ source/libs/comm/cl_ssl_framework.c
-#Fix xterm path
-sed -i -e s,X11/xterm,xterm,g doc/htmlman/htmlman5/sge_conf.html \
- doc/man/man5/sge_conf.5 \
- source/dist/util/arch_variables \
- source/libs/sgeobj/sge_conf.c
-
-# from configure macro - update gnu-config files for aarch64
-for i in $(find . -name config.guess -o -name config.sub) ; do
- [ -f /usr/lib/rpm/redhat/$(basename $i) ] && /usr/bin/rm -f $i && /usr/bin/cp -fv /usr/lib/rpm/redhat/$(basename $i) $i ;
-done
-
-%build
-export JAVA_HOME=%{java_home}
-cd source
-#Setup paths
-cat > aimk.private <<EOF
-set OPENSSL_HOME = /usr
-set BERKELEYDB_HOME = /usr
-%if 0%{?fedora} || 0%{?rhel} >= 7
-set BDB_INCLUDE_SUBDIR = libdb4
-set BDB_LIB_SUBDIR = ../%{_lib}/libdb4
-%else
-set BDB_INCLUDE_SUBDIR =
-set BDB_LIB_SUBDIR = ../%{_lib}
-%endif
-set KRB_HOME = /usr
-set MAN2HTMLPATH = /usr/bin
-set GROFFPATH = /usr/bin
-set SWIG = /usr/bin/swig
-set PERL = /usr/bin/perl
-set TCLSH = /usr/bin/tclsh
-set JUNIT_JAR = /usr/share/java/junit.jar
-set CORE_HOME = `pwd`
-EOF
-cat > build_private.properties <<EOF
-javacc.home=%{_javadir}
-default.sge.javac.source=1.5
-default.sge.javac.target=1.5
-libs.junit.classpath=%{_javadir}/junit.jar
-izpack.lib=/usr/share/java/izpack
-hadoop.javac.source=1.6
-hadoop.javac.target=1.6
-hadoop.home=/usr/share/java
-EOF
-
-#Build libcore.so
-gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -c %SOURCE10 -o libcore.o
-gcc $RPM_LD_FLAGS -shared -o libcore.so libcore.o -lpthread
-export SGE_INPUT_CFLAGS="$RPM_OPT_FLAGS -DNeedVarargsPrototypes"
-export LDFLAGS="$RPM_LD_FLAGS"
-touch aimk
-./aimk -only-depend
-scripts/zerodepend
-./aimk -sys-hwloc -sys-jemalloc -sys-libssl depend
-#TODO - Need IzPack for GUI Installer
-./aimk -no-gui-inst -sys-hwloc -sys-jemalloc -sys-libssl
-./aimk -man -sunman
-#Not build by default - going to need hadoop
-#ant herd
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-#Set the gridengine arch
-gearch=`%{_builddir}/%{buildsubdir}/source/dist/util/arch`
-# set up the target installation directory
-export SGE_ROOT=$RPM_BUILD_ROOT%{_datadir}/gridengine
-mkdir -p $SGE_ROOT
-cd source
-echo 'y'| scripts/distinst -nobdb -noopenssl -local -allall -noexit -mansrc sge ${gearch}
-
-#Create default install configuration
-cp dist/util/install_modules/inst_template.conf \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/my_configuration.conf
-cat %SOURCE2 | while read line
-do
- key=${line/=*/}
- value=${line/*=/}
- sed -i -e "/^${key}=/s,=.*,=$value," $RPM_BUILD_ROOT%{_datadir}/gridengine/my_configuration.conf
-done
-
-install -p -m755 `scripts/compilearch -b`/qevent $RPM_BUILD_ROOT%{_datadir}/gridengine/bin
-
-# man - do before the alternatives rename below
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/man/man* $RPM_BUILD_ROOT%{_mandir}
-
-# Move things to the right location, making links back
-# bin
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/bin $RPM_BUILD_ROOT%{_prefix}
-rmdir $RPM_BUILD_ROOT%{_bindir}/${gearch}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}
-# Rename common queuing binaries and manpages for use with alternatives
-for bin in qalter qdel qhold qmake qrls qselect qstat qsub
-do
- if [ -L $RPM_BUILD_ROOT%{_bindir}/$bin ]
- then
- target=`readlink $RPM_BUILD_ROOT%{_bindir}/$bin`
- rm $RPM_BUILD_ROOT%{_bindir}/$bin
- ln -s ${target}-ge $RPM_BUILD_ROOT%{_bindir}/${bin}-ge
- else
- mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-ge
- fi
- mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-ge.1
-done
-for bin in `find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l`
-do
- ln -s ../../../../bin/`basename $bin` \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}/`basename $bin -ge`
-done
-
-# utilbin
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/gridengine/utilbin
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/utilbin/* \
- $RPM_BUILD_ROOT%{_libexecdir}/gridengine/utilbin
-ln -s ../../../libexec/gridengine/utilbin \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/utilbin/${gearch}
-# We also need some db utils
-ln -s ../../../bin/db_dump ../../../bin/db_load \
- $RPM_BUILD_ROOT%{_datadir}/gridengine/utilbin/
-
-# lib
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/lib $RPM_BUILD_ROOT%{_libdir}
-ln -s ../../%{_lib}/gridengine $RPM_BUILD_ROOT%{_datadir}/gridengine/lib
-# libcore.so
-install -p -m755 libcore.so $RPM_BUILD_ROOT%{_libdir}
-# Move the JNI libraries
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
-for jni in jgdi juti
-do
- mv $RPM_BUILD_ROOT%{_libdir}/${jni}.jar $RPM_BUILD_ROOT%{_libdir}/lib${jni}.so \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/
-done
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mv $RPM_BUILD_ROOT%{_libdir}/drmaa.jar $RPM_BUILD_ROOT%{_javadir}/drmaa.jar
-mv $RPM_BUILD_ROOT%{_libdir}/JSV.jar $RPM_BUILD_ROOT%{_javadir}/JSV.jar
-
-# include
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/include $RPM_BUILD_ROOT%{_includedir}
-
-# app-defaults
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-mv $RPM_BUILD_ROOT%{_datadir}/gridengine/qmon/*.ad \
- $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-
-# The default cell directories
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common
-
-# The default qmaster, spool, and spooldb directories
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/qmaster
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/spool/{admin_hosts,cqueues,job_scripts,resource_quotas,zombies,calendars,exec_hosts,pe,submit_hosts,centry,hostgroups,projects,users,ckpt,jobs,qinstances,usersets}
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/spooldb
-
-# These files get created during user setup (install_qmaster)
-for f in common/{act_qmaster,bootstrap,qtask,settings.csh,settings.sh,sge_aliases,sgeexecd,sgemaster,sge_request}
-do
- touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/${f}
-done
-for f in qmaster/job_scripts spooldb/{__db.00{1,2,3,4,5,6},log.0000000001,sge,sge_job}
-do
- touch $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/${f}
-done
-
-# Environment (SGE_ROOT)
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-install -p -m644 %SOURCE3 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
-
-# Startup scripts
-%if 0%{?fedora} || 0%{?rhel} >= 7
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -p -m644 %SOURCE5 %SOURCE6 %SOURCE7 $RPM_BUILD_ROOT%{_unitdir}
-%else
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -p -m755 %SOURCE5 %SOURCE6 $RPM_BUILD_ROOT%{_initrddir}
-%endif
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -p -m644 %SOURCE9 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridengine
-
-#sgeCA
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/sgeCA
-
-# Don't package catman files
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/catman
-
-# Rename some man pages to avoid conflicts
-pushd $RPM_BUILD_ROOT%{_mandir}/man5
-for f in *
-do
- if [ ${f:0:4} != sge_ ]
- then
- mv $f sge_$f
- fi
-done
-popd
-
-#Don't need these
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/3rd_party
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/dtrace
-
-#Don't ship example binaries
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/examples/jobsbin
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/examples/worker.*
-
-#Cleanup some patch backups that get shipped
-rm $RPM_BUILD_ROOT%{_datadir}/gridengine/util/install_modules/inst_*.sh.*
-
-#TODO - Ship the GUI installer
-rm $RPM_BUILD_ROOT%{_datadir}/gridengine/start_gui_installer
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%pre
-getent group %{username} >/dev/null || groupadd -r %{username}
-getent passwd %{username} >/dev/null || \
- useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
- -c '%{gecos}' %{username}
-exit 0
-
-
-%post -p /sbin/ldconfig
-
-%posttrans
-alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-ge 10 \
- --slave %{_mandir}/man1/qsub.1.gz qsub-man \
- %{_mandir}/man1/qsub-ge.1.gz \
- --slave %{_bindir}/qalter qalter %{_bindir}/qalter-ge \
- --slave %{_mandir}/man1/qalter.1.gz qalter-man \
- %{_mandir}/man1/qalter-ge.1.gz \
- --slave %{_bindir}/qdel qdel %{_bindir}/qdel-ge \
- --slave %{_mandir}/man1/qdel.1.gz qdel-man \
- %{_mandir}/man1/qdel-ge.1.gz \
- --slave %{_bindir}/qhold qhold %{_bindir}/qhold-ge \
- --slave %{_mandir}/man1/qhold.1.gz qhold-man \
- %{_mandir}/man1/qhold-ge.1.gz \
- --slave %{_bindir}/qrls qrls %{_bindir}/qrls-ge \
- --slave %{_mandir}/man1/qrls.1.gz qrls-man \
- %{_mandir}/man1/qrls-ge.1.gz \
- --slave %{_bindir}/qselect qselect %{_bindir}/qselect-ge \
- --slave %{_mandir}/man1/qselect.1.gz qselect-man \
- %{_mandir}/man1/qselect-ge.1.gz \
- --slave %{_bindir}/qstat qstat %{_bindir}/qstat-ge \
- --slave %{_mandir}/man1/qstat.1.gz qstat-man \
- %{_mandir}/man1/qstat-ge.1.gz || :
-
-%preun
-if [ $1 -eq 0 ] ; then
- alternatives --remove qsub %{_bindir}/qsub-ge || :
-fi
-
-%postun -p /sbin/ldconfig
-
-
-%post execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_post sge_execd.service
-%else
-/sbin/chkconfig --add sge_execd
-%endif
-
-
-%postun execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_postun_with_restart sge_execd.service
-%else
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /sbin/service sge_execd condrestart >/dev/null 2>&1 || :
-fi
-%endif
-
-%preun execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_preun sge_execd.service
-%else
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /sbin/service sge_execd stop
- /sbin/chkconfig --del sge_execd
-fi
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerun -- gridengine-execd < 6.2u5p2-2
-/usr/bin/systemd-sysv-convert --save sge_execd >/dev/null 2>&1 || :
-/sbin/chkconfig --del sge_execd >/dev/null 2>&1 || :
-/bin/systemctl try-restart sge_execd.service >/dev/null 2>&1 || :
-%endif
-
-%post qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_post sgemaster.service
-%systemd_post sge_shadowd.service
-%else
-/sbin/chkconfig --add sgemaster
-%endif
-
-%postun qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_postun_with_restart sgemaster.service
-%systemd_postun_with_restart sge_shadowd.service
-%else
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /sbin/service sgemaster condrestart >/dev/null 2>&1 || :
-fi
-%endif
-
-%preun qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%systemd_preun sgemaster.service
-%systemd_preun sge_shadowd.service
-%else
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /sbin/service sgemaster stop
- /sbin/chkconfig --del sgemaster
-fi
-%endif
-
-
-%files
-%doc Licenses README
-%config(noreplace) %{_sysconfdir}/profile.d/sge.*
-%config(noreplace) %{_sysconfdir}/sysconfig/gridengine
-# Only the file %{_bindir}/qmake-ge is
-# under GPLv2+
-# Olny the file %{_bindir}/qtcsh is
-# under BSD with advertising
-%{_bindir}/*
-%exclude %{_bindir}/qacct
-%exclude %{_bindir}/qmon
-%exclude %{_bindir}/sge_execd
-%exclude %{_bindir}/sge_qmaster
-%exclude %{_bindir}/sge_shadowd
-%exclude %{_bindir}/sge_*shepherd
-%{_libdir}/%{name}
-%{_libdir}/libcore.so
-%{_libdir}/libdrmaa.so*
-%{_libdir}/libspoolb.so
-%{_libdir}/libspoolc.so
-%{_javadir}/drmaa.jar
-%{_javadir}/JSV.jar
-%{_libexecdir}/gridengine/
-%attr(-,%username,%username) %dir %{_datadir}/gridengine
-%{_datadir}/gridengine/bin
-%exclude %{_datadir}/gridengine/bin/*/qacct
-%exclude %{_datadir}/gridengine/bin/*/qmon
-%exclude %{_datadir}/gridengine/bin/*/sge_execd
-%exclude %{_datadir}/gridengine/bin/*/sge_qmaster
-%exclude %{_datadir}/gridengine/bin/*/sge_shadowd
-%exclude %{_datadir}/gridengine/bin/*/sge_*shepherd
-%{_datadir}/gridengine/ckpt
-%attr(-,%username,%username) %ghost %{_datadir}/gridengine/default
-%{_datadir}/gridengine/doc
-%{_datadir}/gridengine/hadoop
-%{_datadir}/gridengine/inst_sge
-%{_datadir}/gridengine/lib
-%{_datadir}/gridengine/mpi
-%{_datadir}/gridengine/my_configuration.conf
-%dir %{_datadir}/gridengine/pvm
-%{_datadir}/gridengine/pvm/*
-%exclude %{_datadir}/gridengine/pvm/src
-%{_datadir}/gridengine/util
-%dir %{_datadir}/gridengine/utilbin
-%{_datadir}/gridengine/utilbin/*
-%exclude %{_datadir}/gridengine/utilbin/db_*
-%{_mandir}/man1/*.1*
-%exclude %{_mandir}/man1/qmon.1*
-%{_mandir}/man5/*.5*
-%{_mandir}/man8/*.8*
-%exclude %{_mandir}/man8/sge_qmaster.8*
-%exclude %{_mandir}/man8/sge_shadowd.8*
-%exclude %{_mandir}/man8/sge_execd.8*
-%exclude %{_mandir}/man8/sge_*shepherd.8*
-%attr(-,%username,%username) %dir %{_localstatedir}/spool/gridengine
-%attr(-,%username,%username) %dir %{_localstatedir}/spool/gridengine/default
-
-%files devel
-%{_includedir}/*
-%{_datadir}/gridengine/examples
-%{_datadir}/gridengine/pvm/src
-%{_mandir}/man3/*.3*
-
-%files qmon
-%{_bindir}/qmon
-%{_libdir}/libXltree.so
-%{_datadir}/X11/app-defaults/*
-%{_datadir}/gridengine/bin/*/qmon
-%{_datadir}/gridengine/qmon/
-%{_mandir}/man1/qmon.1*
-
-%files execd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%{_unitdir}/sge_execd.service
-%else
-%{_initrddir}/sge_execd
-%endif
-%{_bindir}/sge_execd
-%{_bindir}/sge_*shepherd
-%{_datadir}/gridengine/install_execd
-%{_datadir}/gridengine/bin/*/sge_execd
-%{_datadir}/gridengine/bin/*/sge_*shepherd
-%{_mandir}/man8/sge_execd.8*
-%{_mandir}/man8/sge_*shepherd.8*
-
-%files qmaster
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%{_unitdir}/sgemaster.service
-%{_unitdir}/sge_shadowd.service
-%else
-%{_initrddir}/sgemaster
-%endif
-%{_bindir}/qacct
-%{_bindir}/sge_qmaster
-%{_bindir}/sge_shadowd
-%{_datadir}/gridengine/bin/*/qacct
-%{_datadir}/gridengine/bin/*/sge_qmaster
-%{_datadir}/gridengine/bin/*/sge_shadowd
-%{_datadir}/gridengine/install_qmaster
-%{_datadir}/gridengine/utilbin/db_*
-%{_mandir}/man8/sge_qmaster.8*
-%{_mandir}/man8/sge_shadowd.8*
-%attr(-,%username,%username) %dir %{_localstatedir}/sgeCA
-%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/qmaster
-%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spool
-%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spooldb
-
-
-%changelog
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 12 2016 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-31
-- Set locked memory limit to unlimited for sge_execd for InfiniBand use
-- Minor cleanup
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2011.11p1-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Oct 14 2015 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 2011.11p1-29
-- Fix build on AArch64
-
-* Tue Oct 6 2015 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-28
-- Build against openmotif
-
-* Sun Aug 30 2015 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-27
-- Rebuild for jemalloc 4.0.0
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Apr 10 2015 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-25
-- Keep network.target in service files for non-NM network config
-
-* Tue Oct 28 2014 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-24
-- Unit files are not executable
-
-* Fri Oct 3 2014 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-23
-- Update format patch to fix more -Werror=format-security errors (bug #1037103)
-
-* Thu Sep 4 2014 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-22
-- Add PIDFile to sgemaster.service (bug #1082129)
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Aug 7 2014 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-20
-- Fix build with -Werror=format-security (bug #1037103)
-
-* Mon Jul 14 2014 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-19
-- Use After=network-online.target for service files
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Thu Oct 3 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-17
-- Upload updated tarball without .svn dirs
-- Drop non-functional url for libcore.c
-
-* Sat Aug 03 2013 Petr Pisar <ppisar(a)redhat.com> - 2011.11p1-16
-- Perl 5.18 rebuild
-
-* Tue Jul 30 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-15
-- Ship libdrmaa.so in main package, needed for Java runtime (bug #671880)
-
-* Thu Jul 18 2013 Petr Pisar <ppisar(a)redhat.com> - 2011.11p1-14
-- Perl 5.18 rebuild
-
-* Tue May 21 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-13
-- Add sge_shadowd.service and move shadowd to qmaster package (bug #955768)
-
-* Tue May 21 2013 Orion Poplwski <orion(a)cora.nwra.com> - 2011.11p1-12
-- Add patch to add LDFLAGS to LFLAGS so _hardened_build actually works (bug #965479)
-
-* Wed May 1 2013 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-11
-- Fix user/group creation to use dynamic id allocation
-
-* Wed Apr 24 2013 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-10
-- Use updated systemd scriptlets (bug #850136)
-
-* Mon Apr 22 2013 Orion Poplawski <orion(a)cora.nwra.com> - 2011.11p1-9
-- Only BR ant-nodeps on RHEL
-
-* Wed Apr 10 2013 Jon Ciesla <limburgher(a)gmail.com> - 2011.11p1-8
-- Migrate from fedora-usermgmt to guideline scriptlets.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Oct 16 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-6
-- Build java with source/target 1.5 to properly compile generics (bug 842595)
-
-* Wed Oct 3 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-5
-- Add patch to generate load sensor reports just before sending them
-- Only BR hostname on Fedora
-- Fix Fedora conditional for db4 support
-
-* Fri Aug 3 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-4
-- Support libdb4 in Fedora 18+
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2011.11p1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jul 9 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-2
-- Do not remove spool directory in execd uninstall script (bug 836102)
-
-* Mon Jul 9 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11p1-1
-- Update to 2011.11p1
-- Drop env-code-injection, buffer-overflow, and symlink patches
-- Rebase rctemplates patch
-
-* Fri Jul 6 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-4.svn131
-- Add patch to set JAVA_LIB_ARCH on arm (bug 837137)
-- Add BR hostname
-
-* Tue Apr 17 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-3.svn131
-- Set _hardened_build
-- Add two more upstream security patches
-- Renumber patches
-
-* Tue Apr 17 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-2.svn131
-- Update to svn 131
-- Add upstream env-code-injection security patch
-
-* Wed Mar 21 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-1.svn115
-- Update to svn 115
-- Add back SysV init script handling for EL builds
-- Drop inst, db, lesstif, libs, error, openssl, qtcsh patches fixed upstream
-- Build with -sys-libssl
-- Use sge_/SGE_ names in man pages
-
-* Wed Mar 14 2012 Orion Poplawski <orion(a)cora.nwra.com> 2011.11-1.svn93
-- Update to gridscheduler 2011.11 plus svn revision 93
-- Rebase ssl, rctemplates, and rpath patches
-- Drop Werror, quotes, ant, auto, jemalloc, paths, and add-missing
- patches fixed upstream
-- Add qtcsh patch to avoid using -R when linking
-- Add BR on hwloc-devel
-- Make systemd conditional on Fedora >= 15
-- Use -sys-hwloc and -sys-jemalloc aimk flags
-- Remove qacct and sge_qmaster from BINFILES checks (Bug 803502)
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u5p2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Oct 14 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-6
-- Update linux 3 patch to fix installed arch script as well
-
-* Thu Sep 8 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-5
-- Add patch to properly quote m4 macros
-- Add patch to hack linux 3 support - keeps arch as lx26-*
-- Add patch to run automake with --add-missing to fix qmake build
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-4
-- Add SysV to systemd migration triggers
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-3
-- Add BR groff
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-2
-- Migrate to systemd unit files
-
-* Tue Sep 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5p2-1
-- Update to opengridscheduler release 6.2u5p2
-- Drop patches applied upstream
-
-* Fri Jul 29 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-10
-- Move sge_*shepherd to execd sub-package
-
-* Thu Jun 23 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-9
-- Use system jemalloc library, fixes FTBFS bug 715676
-- Cleanup some '//' in include paths triggering debugedit failures
-
-* Fri May 6 2011 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-8
-- Add patches from opengridscheduler to fix vmem reporting and
- slotwise preemption
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Dec 6 2010 Orion Poplawski <orion(a)cora.nwra.com> 6.2u5-6
-- Add Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi
- to qmon package (bug 657406)
-- Add patch to fix issue with hostnames (bug 654943)
-
-* Wed Aug 25 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-5
-- Update instructions to referece ./my_configuration.conf (bug #557628)
-- Don't set IFS when reading conf file, breaks lots of stuff
-- Set SGE_JVM_LIB_PATH to none by default so we don't setup JMF
-
-* Wed Aug 11 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-4
-- Use upstream my_configuration.conf as template for default one (bugs 557628,566294)
-- Set SGE_CELL in sge.sh/sge.csh (bug 620907)
-
-* Mon Jul 12 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-3
-- Exclude ppc64 - no java 1.6.0
-
-* Tue Feb 16 2010 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-2
-- Update ssl patch to add -lcrypt to fix FTBFS bug #565003
-
-* Mon Dec 28 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u5-1
-- Update to 6.2u5
-
-* Thu Oct 29 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u4-1
-- Update to 6.2u4
-- Drop import patch fixed upstream
-- Updated rctemplates and auto patches
-- Add patch to call ant with appropriate library directory
-
-* Tue Aug 25 2009 Tomas Mraz <tmraz(a)redhat.com> - 6.2u3-3
-- rebuilt with new openssl
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 17 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u3-1
-- Update to 6.2u3
-- Drop ppc patch fixed upstream
-- Update rctemplates patch
-
-* Mon Apr 6 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u2_1-1
-- Update to 6.2u2_1
-- Rebase several patches
-- Add patch to rename getline()
-- Add patch to compile with correct libs on ppc/ppc64
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 6.2u1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Feb 19 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u1-3
-- Add patch to import specific classes to avoid pulling in other ones
-
-* Thu Jan 15 2009 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u1-2
-- Rebuild with openssl-0.9.8j
-
-* Thu Dec 18 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2u1-1
-- Update to 6.2u1
-
-* Mon Nov 17 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-5
-- Leave qmake-ge in %{_bindir}
-- Use system db_* utils in bdb_checkpoint script
-- Fix xterm path in default setup
-- Change java BR to >= 1.6.0 to allow building with other 1.6 javas
-
-* Tue Nov 11 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-4
-- Add note to README about localhost line in /etc/hosts
-- Cleanup setting.sh some, no more MAN stuff
-- Add conditional build support for EL
-
-* Wed Nov 5 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-3
-- Add Requires: ncurses for "clear"
-- Add patch from CVS to update install scripts
-- Patch sge_ca script not to use system openssl
-- Modify code to dlopen runtime ssl library
-- Patch install_qmaster to update /etc/sysconfig/gridengine
-- Point install scripts to proper JAVA_HOME
-- Have sgemaster init script use /etc/sysconfig/gridengine
-- Add patch to point to jni library locations
-- Make sure install_qmaster sets up default managers/operators
-
-* Fri Sep 26 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-2
-- No more sge_schedd in 6.2, remove from startup script
-
-* Mon Aug 11 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2-1
-- Update to 6.2 final
-
-* Tue Jul 15 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2beta2-0.1
-- Provide some installation instructions for these RPMs
-- Fix up some installation script issues
-- Ghost more directories created later
-
-* Thu Jun 5 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.2beta-0
-- Update to 6.2beta
-- Use aimk.private and build_private.properties instead of patching
- aimk and build.properties
-- Cleanup some extra /s in paths
-- Shift to Java 1.6.0 because of new requirements in the source
-- Move Java JNI libraries to proper location
-- Drop several upstreamed patches
-- Add patch to avoid linking unneeded libraries
-
-* Fri Apr 11 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u4-1
-- Update to 6.1u4
-
-* Tue Apr 1 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-7
-- Use alternatives to avoid conflicts with torque (bug #437613)
-- Add patch to support stricter csh variable handling
-
-* Fri Feb 8 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-6
-- Fixup subpackage License tags
-- Service name change in scriptlets
-
-* Thu Feb 7 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-5
-- Rewrite initscripts
-- Remove spurious Requires(post): /sbin/ldconfig
-- Add License explanation file and fix License tags
-
-* Mon Feb 4 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-4
-- Drop arch from source
-- Fix Requires() for main package
-- Move man3 to -devel
-
-* Fri Feb 1 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-3
-- Fix various review comments and rpmlint issues (bug #316141)
-
-* Thu Jan 31 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-2
-- Actually ship sge_execd in the execd subpackage
-- Don't complain about missing sge_execd during inst_sge -upd
-- Link in db_dump and db_load into utilbin so that update scripts can find them
-
-* Wed Jan 9 2008 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u3-1
-- Update to 6.1u3
-- Split execd into sub-package
-
-* Thu Nov 15 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-5
-- Add BR net-tools for hostname for java build on devel
-
-* Mon Nov 12 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-4
-- Add patch and source for ppc/ppc64 builds
-
-* Fri Nov 2 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-3
-- Add patch to fix qstat xml output
-
-* Thu Oct 18 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-2
-- Cleanup arch handling
-- Install qevent
-
-* Tue Oct 2 2007 - Orion Poplawski <orion(a)cora.nwra.com> - 6.1u2-1
-- Fedora packaging
diff --git a/gridengine.sysconfig b/gridengine.sysconfig
deleted file mode 100644
index ae0d43e..0000000
--- a/gridengine.sysconfig
+++ /dev/null
@@ -1,50 +0,0 @@
-SGE_ROOT=/usr/share/gridengine
-# If running under a different cell and using systemd, you will also need to
-# copy # /uer/lib/systemd/system/sgemaster.service to /etc/systemd/system/sgemaster.service
-# and change the cell name there.
-SGE_CELL=default
-#Uncomment this if using infiniband to remove the locked memory limit
-#RTLIMIT_MEMLOCKED=unlimited
-
-#-- shadow master daemon control variables
-# These variables interact in the following way.
-# - The master host updates the heartbeat file every 30 seconds.
-# - The sge_shadowd daemon checks for changes to heartbeat file every
-# number of seconds defined by the SGE_CHECK_INTERVAL variable. So,
-# this value must be greater than 30 seconds.
-# - If the sge_shadowd daemon notices that the heartbeat file has been
-# updated, it starts waiting again until it is once more time to check
-# the heartbeat file.
-# - If the sge_shadowd daemon notices that the heartbeat file has not
-# been updated, it waits for number of seconds defined by the
-# SGE_CHECK_INTERVAL variable to expire. This step lets you make sure
-# that the sge_shadowd daemon is not too aggressive in trying to
-# takeover and allows the master host some leeway in updating the
-# heartbeat file.
-# - When the SGE_GET_ACTIVE_INTERVAL has expired, sge_shadowd daemon
-# takes over if heartbeat file is still not updated.
-# - A reasonable configuration might be to set the SGE_CHECK_INTERVAL
-# to be 45 seconds and the SGE_GET_ACTIVE_INTERVAL to be 90 seconds.
-# So, after about 2 minutes, the take over will occur. If you want to
-# check the operation of the shadow host after you have configured
-# these environment variables you will have to pull out the master
-# host's network cable or kill -9 the master daemon process to simulate
-# a failure because a clean shutdown creates a lock file in
-# $SGE_ROOT/$SGE_CELL/qmaster/lock that prevents shadow daemons taking
-# over. This can be avoided by deleting the lock file on shudown, e.g
-# by adding the following line to the sgemaster.service systemd unitfile
-# ExecStopPost=/bin/su - sgeadmin -c 'rm -f $SGE_ROOT/$SGE_CELL/qmaster/lock'
-
-# This variable controls the interval in which sge_shadowd pauses if a
-# takeover bid fails. This value is used only when there are multiple
-# sge_shadowd instances and they are contending to be the master.
-# (the default is 600 seconds.)
-#SGE_DELAY_TIME=600
-
-# This variable controls the interval in which the sge_shadowd checks
-# the heartbeat file (60 seconds by default.)
-#SGE_CHECK_INTERVAL=60
-
-# This variable controls the interval when a sge_shadowd instance tries
-# to take over when the heartbeat file has not changed.
-#SGE_GET_ACTIVE_INTERVAL=120
diff --git a/libcore.c b/libcore.c
deleted file mode 100644
index 912d2d6..0000000
--- a/libcore.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Place holder library to ensure prctl(PR_SET_DUMPABLE, 1) is done after
- * each setuid(), seteuid(), setgid(), and setegid()
- */
-#include <sys/types.h>
-#include <dlfcn.h>
-#include <pthread.h>
-#include <sys/prctl.h>
-
-static pthread_once_t only_once = PTHREAD_ONCE_INIT;
-
-static int (*setuid_func)(uid_t uid) = NULL;
-static int (*seteuid_func)(uid_t uid) = NULL;
-static int (*setgid_func)(gid_t gid) = NULL;
-static int (*setegid_func)(gid_t gid) = NULL;
-
-static void init_funcs(void)
-{
- setuid_func = (int (*)(uid_t uid))dlsym(RTLD_NEXT, "setuid");
- seteuid_func = (int (*)(uid_t uid))dlsym(RTLD_NEXT, "seteuid");
- setgid_func = (int (*)(gid_t uid))dlsym(RTLD_NEXT, "setgid");
- setegid_func = (int (*)(gid_t uid))dlsym(RTLD_NEXT, "setegid");
-}
-
-#define WRAP(func, clib_func, t) \
-int func(t uid) \
-{ \
- pthread_once(&only_once, init_funcs); \
- int ret = clib_func(uid); \
- prctl(PR_SET_DUMPABLE, 1, 42, 42, 42); \
- return ret; \
-}
-
-WRAP(setuid, setuid_func, uid_t)
-WRAP(seteuid, seteuid_func, uid_t)
-WRAP(setgid, setgid_func, gid_t)
-WRAP(setegid, setegid_func, gid_t)
diff --git a/maketarball b/maketarball
deleted file mode 100755
index ee1b0dd..0000000
--- a/maketarball
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-if [ -z "$1" ]
-then
- echo "Usage: $0 TAG"
- exit 1
-else
- tag=$1
-fi
-
-rm -rf gridengine
-cvs -d :pserver:guest@cvs.sunsource.net:/cvs -z3 export -r $tag gridengine
-rm -rf gridengine/{gep,review,www}
-tar cjf ge-${tag}-src.tar.bz2 gridengine
diff --git a/sge.csh b/sge.csh
deleted file mode 100644
index d49aa9c..0000000
--- a/sge.csh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Make sure SGE_ROOT is set
-if ( $?SGE_ROOT ) then
- exit
-endif
-
-if ( -f /etc/sysconfig/gridengine ) then
- setenv SGE_ROOT `grep "^SGE_ROOT=" /etc/sysconfig/gridengine | cut -d"=" -f2`
- setenv SGE_CELL `grep "^SGE_CELL=" /etc/sysconfig/gridengine | cut -d"=" -f2`
-endif
diff --git a/sge.sh b/sge.sh
deleted file mode 100644
index 6752de8..0000000
--- a/sge.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ -z "$SGE_ROOT" ] ; then
- if [ -f /etc/sysconfig/gridengine ] ; then
- . /etc/sysconfig/gridengine
- export SGE_ROOT
- export SGE_CELL
- fi
-fi
diff --git a/sge_execd b/sge_execd
deleted file mode 100644
index c1bdbd9..0000000
--- a/sge_execd
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/sh
-#
-# sge_execd Gridengine execution daemon
-#
-# chkconfig: - 99 01
-# description: The Gridexecution daemon starts and manages grid jobs
-
-### BEGIN INIT INFO
-# Provides: sge_execd
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $network $local_fs $remote_fs
-# Should-Start:
-# Should-Stop:
-# Default-Start:
-# Default-Stop: 0 1 6
-# Short-Description: Gridengine execution daemon
-# Description: The Gridexecution daemon starts and manages grid jobs
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-exec="/usr/bin/sge_execd"
-prog="sge_execd"
-
-#Defaults
-SGE_ROOT=/usr/share/gridengine
-SGE_CELL=default
-
-#Configuration
-config=/etc/sysconfig/gridengine
-[ -e $config ] && . $config
-
-#Export these
-export SGE_ROOT SGE_CELL
-
-utilbin_dir=/usr/libexec/gridengine/utilbin
-# UQHOST is the local host name (unqualified name)
-UQHOST=`$utilbin_dir/gethostname -name | cut -f1 -d.`
-execd_spool_dir=`/usr/bin/qconf -sconf $UQHOST 2>&- | awk '$1 == "execd_spool_dir" { print $2 }'`
-if [ -z "$execd_spool_dir" ]; then
- execd_spool_dir=`/usr/bin/qconf -sconf | awk '$1 == "execd_spool_dir" { print $2 }'`
-fi
-#Add the hostname to the spool directory
-execd_spool_dir=${execd_spool_dir}/${UQHOST}
-pidfile=${execd_spool_dir}/execd.pid
-
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
- [ -x $exec ] || exit 5
- #Set maximum locked memory, needed for infiniband support
- [ -n "$RLIMIT_MEMLOCKED" ] && ulimit -l $RLIMIT_MEMLOCKED
- echo -n $"Starting $prog: "
- daemon --check $prog --pidfile=$pidfile $exec
- retval=$?
- echo
- [ $retval -eq 0 ] && touch $lockfile
- return $retval
-}
-
-stop() {
- echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- if [ "$1" != "soft" ]; then
- for jobid in `ls $execd_spool_dir/active_jobs`; do
- echo " Shutting down Grid Engine shepherd of job $jobid"
- killproc -p $execd_spool_dir/active_jobs/$jobid/pid sge_shepherd
- done
- fi
- return $retval
-}
-
-restart() {
- stop soft
- start
-}
-
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- # run checks to determine if the service is running or use generic status
- status $prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
- start)
- rh_status_q && exit 0
- $1
- ;;
- stop)
- rh_status_q || exit 0
- $1
- ;;
- softstop)
- rh_status_q || exit 0
- stop soft
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- *)
- echo $"Usage: $0 {start|stop|softstop|status|restart|try-restart|reload|force-reload}"
- exit 2
-esac
-exit $?
diff --git a/sge_execd.service b/sge_execd.service
deleted file mode 100644
index ef922fa..0000000
--- a/sge_execd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Gridengine execution daemon
-After=network.target network-online.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/gridengine
-# For InfiniBand
-LimitMEMLOCK=infinity
-ExecStart=/usr/bin/sge_execd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sge_shadowd.service b/sge_shadowd.service
deleted file mode 100644
index 6c87ae2..0000000
--- a/sge_shadowd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Gridengine shadow master daemon
-After=network.target network-online.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/gridengine
-ExecStart=/usr/bin/sge_shadowd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sgemaster b/sgemaster
deleted file mode 100644
index 7e615dc..0000000
--- a/sgemaster
+++ /dev/null
@@ -1,389 +0,0 @@
-#!/bin/sh
-#
-# sgemaster Gridengine master daemon and scheduler
-#
-# chkconfig: - 98 02
-# description: The gridengine master daemon and scheduler
-
-### BEGIN INIT INFO
-# Provides: sge_qmaster
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $network $local_fs $remote_fs
-# Should-Start:
-# Should-Stop:
-# Default-Start:
-# Default-Stop: 0 1 6
-# Short-Description: Gridengine master daemon and scheduler
-# Description: The gridengine master daemon and scheduler
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-master_exec="/usr/bin/sge_qmaster"
-master_prog="sge_qmaster"
-
-#Defaults
-SGE_ROOT=/usr/share/gridengine; export SGE_ROOT
-SGE_CELL=default; export SGE_CELL
-
-#Configuration
-config=/etc/sysconfig/gridengine
-[ -e $config ] && . $config
-
-qmaster_spool_dir=`awk '$1 == "qmaster_spool_dir" { print $2 }' $SGE_ROOT/$SGE_CELL/common/bootstrap`
-master_pidfile=$qmaster_spool_dir/qmaster.pid
-retval=0
-
-
-#---------------------------------------------------------------------------
-# CheckIfQmasterHost
-# If our hostname given in $1 is the same as in the "act_qmaster" file
-# echo "true" else echo "false"
-#
-CheckIfQmasterHost()
-{
- host=$1
-
- if [ "$host" = "`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`" ]; then
- echo true
- else
- echo false
- fi
-}
-
-#---------------------------------------------------------------------------
-# CheckIfPrimaryQmasterHost
-# Check if our hostname given in $1 is the same as in the
-# "primary_qmaster" file
-# echo true if there is our hostname else echo false
-#
-CheckIfPrimaryQmasterHost()
-{
- host=$1
-
- fname=$SGE_ROOT/$SGE_CELL/common/primary_qmaster
-
- if [ -f $fname ]; then
- if [ "$host" = "`cat $fname`" ]; then
- echo true
- else
- echo false
- fi
- else
- echo false
- fi
-}
-
-
-#---------------------------------------------------------------------------
-# CheckIfShadowMasterHost
-# Check if our hostname given in $1 is contained in the
-# "shadow_masters" file
-# set shadow_host true if there is our hostname
-#
-CheckIfShadowMasterHost()
-{
- host=$1
-
- fname=$SGE_ROOT/$SGE_CELL/common/shadow_masters
-
- if [ -f $fname ]; then
- grep -i $host $fname 2>&1 > /dev/null
- if [ $? = 0 ]; then
- shadow_host="true"
- else
- shadow_host="false"
- fi
- else
- shadow_host="false"
- fi
-}
-
-#---------------------------------------------------------------------------
-# GetAdminUser
-# echo the name of the admin user on this system
-# echo "root" if admin user retrieval fails
-GetAdminUser()
-{
- cfgname=$SGE_ROOT/$SGE_CELL/common/bootstrap
- user=none
-
- if [ -f $cfgname ]; then
- user=`grep admin_user $cfgname | awk '{ print $2 }'`
- fi
-
- if [ `echo $user|tr "A-Z" "a-z"` = "none" ]; then
- user=root
- fi
- echo $user
-}
-
-#---------------------------------------------------------------------------
-# CheckRunningQmaster
-# checks, if sge_qmaster is running
-# In error case the sge_qmaster didn't start, silently
-#
-CheckRunningQmaster()
-{
- masterhost=`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`
- running=false
- loop=0
-
- if [ "$SGE_QMASTER_PORT" = "" ]; then
- SGE_QMASTER_PORT=`$utilbin_dir/getservbyname -number sge_qmaster`
- fi
-
- while [ $running = "false" -a $loop -ne 30 ]; do
- qping -info $masterhost $SGE_QMASTER_PORT qmaster 1 > /dev/null 2>&1
-
- if [ "$?" = 0 ]; then
- running=true
- else
- sleep 2
- masterhost=`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`
- loop=`expr $loop + 1`
- fi
- done
-
- if [ $running = "false" ]; then
- echo
- echo "sge_qmaster didn't start!"
- echo "Please check the messages file"
- echo
- fi
-}
-
-#---------------------------------------------------------------------------
-usage()
-{
- echo "Grid Engine start/stop script. Valid parameters are:"
- echo ""
- echo " \"start\" start qmaster daemon"
- echo " \"stop\" shutdown qmaster daemon"
- echo " \"-qmaster\" only start/stop qmaster (if applicable)"
- echo " \"-shadowd\" only start/stop shadowd (if applicable)"
- echo " \"-migrate\" shutdown qmaster if it's running on another"
- echo " host and restart it on this host"
- echo " Migration only works if this host is an admin host"
- echo ""
- echo "Only one of the parameters \"start\", \"stop\" is allowed."
- echo "Only one of the parameters beginning with \"-\" is allowed."
- echo
- echo "Default for \"stop\" is shutting down all components."
- echo
- exit 1
-}
-
-CheckArgs() {
- if [ "$1" = -qmaster ]; then
- qmaster=true
- shadowd=false
- elif [ "$1" = -shadowd ]; then
- qmaster=false
- shadowd=true
- elif [ "$1" = -migrate ]; then
- migrate_qmaster=true
- qmaster=true
- shadowd=false
- else
- usage
- fi
-}
-
-utilbin_dir=/usr/libexec/gridengine/utilbin
-if [ "$utilbin_dir" = "none" ]; then
- echo "can't determine path to Grid Engine utility binaries"
- exit 6
-fi
-
-HOST=`$utilbin_dir/gethostname -aname`
-UQHOST=`$utilbin_dir/gethostname -aname | cut -f1 -d.`
-CheckIfShadowMasterHost $HOST
-
-
-lockfile=/var/lock/subsys/sgemaster
-
-#Default actions
-qmaster=true
-shadowd=true
-qstd=false
-migrate_qmaster=false
-
-start() {
- # qmaster_host=true if qmaster was running on this host the last time
- # this host is an execution host
-
- qmaster_host=`CheckIfQmasterHost $HOST`
- primary_qmaster_host=`CheckIfPrimaryQmasterHost $HOST`
-
- if [ $qmaster = true -a $qmaster_host = true -a $migrate_qmaster = true ]; then
- echo " qmaster and scheduler running on this host. Will not migrate qmaster."
- exit 1
- fi
-
- [ -x $master_exec ] || exit 5
-
- if [ $qmaster = true -a $qmaster_host = false -a \
- \( $primary_qmaster_host = true -o $migrate_qmaster = true \) ]; then
- actual_qmaster_host=`cat $SGE_ROOT/$SGE_CELL/common/act_qmaster`
- echo " shutting down qmaster and scheduler on host \"$actual_qmaster_host\" ..."
- qconf_output=`qconf -ks 2>&1 | grep "denied"`
- if [ "$qconf_output" != "" ]; then
- echo " denied: host \"$HOST\" is no admin host."
- exit 1
- fi
- qconf -km > /dev/null 2>&1
-
- qping_count=0
- qping_retries=10
- qping_exit_state=0
- while [ $qping_count -lt $qping_retries ]; do
- qping -info $actual_qmaster_host $SGE_QMASTER_PORT qmaster 1 > /dev/null 2>&1
- qping_exit_state=$?
- if [ $qping_exit_state -ne 0 ]; then
- break
- fi
- sleep 3
- qping_count=`expr $qping_count + 1`
- done
-
- if [ $qping_exit_state -eq 0 ]; then
- # qmaster is still running
- echo " qmaster on host $actual_qmaster_host still alive. Cannot migrate qmaster."
- exit 1
- fi
-
- lock_file_read_retries=10
- lock_file_read_count=0
- lock_file_found=0
- while [ $lock_file_read_count -lt $lock_file_read_retries ]; do
- if [ -f $qmaster_spool_dir/lock ]; then
- lock_file_found=1
- break
- fi
- sleep 3
- lock_file_read_count=`expr $lock_file_read_count + 1`
- done
-
- if [ $lock_file_found -eq 0 ]; then
- # old qmaster did not write lock file
- echo " old qmaster did not write lock file. Cannot migrate qmaster."
- echo " Please verify that qmaster on host $actual_qmaster_host is down"
- echo " and make sure that the lock file in qmaster spool directory is"
- echo " read-able."
- exit 1
- fi
-
- qmaster_host=true
- fi
-
- if [ $qmaster = true -a $qmaster_host = true ]; then
- echo -n $"Starting $master_prog: "
- daemon --check $master_prog --pidfile=$master_pidfile $master_exec
- retval=$?
- CheckRunningQmaster
- elif [ $qmaster = true -a $qmaster_host = false ]; then
- echo
- echo "sge_qmaster didn't start!"
- echo "This is not a qmaster host!"
- echo "Please, check your act_qmaster file!"
- echo
- fi
-
- if [ $shadowd = true -a $shadow_host = true ]; then
- pidfile=$qmaster_spool_dir/shadowd_$HOST.pid
- [ -f $pidfile ] || pidfile=$qmaster_spool_dir/shadowd_$UQHOST.pid
-
- echo -n $"Starting sge_shadowd: "
- daemon --check sge_shadowd --pidfile=$pidfile /usr/bin/sge_shadowd
- retval=$?
- fi
-
- echo
- [ $retval -eq 0 ] && touch $lockfile
- return $retval
-}
-
-stop() {
- if [ $shadow_host = true ]; then
- prog=sge_shadowd
- pidfile=$qmaster_spool_dir/shadowd_$UQHOST.pid
- [ -f $pidfile ] || pidfile=$qmaster_spool_dir/shadowd_$HOST.pid
-
- # Send SIGTERM to shadowd
- echo -n $"Stopping $prog: "
- killproc -p $pidfile $prog
- retval=$?
- fi
-
- if [ $qmaster = true ]; then
- if [ `CheckIfQmasterHost $HOST` = true ]; then
- # Send SIGTERM to qmaster
- echo -n $"Stopping $master_prog: "
- killproc -p $master_pidfile $master_prog
- retval=`expr $retval + $?`
- fi
- fi
-
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- return $retval
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- # run checks to determine if the service is running or use generic status
- status $master_prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-
-case "$1" in
- start)
- rh_status_q && exit 0
- [ -n "$2" ] && CheckArgs $2
- $1
- ;;
- stop)
- rh_status_q || exit 0
- [ -n "$2" ] && CheckArgs $2
- $1
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
- exit 2
-esac
-exit $?
diff --git a/sgemaster.service b/sgemaster.service
deleted file mode 100644
index 7c23a17..0000000
--- a/sgemaster.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Gridengine master daemon and scheduler
-After=network.target network-online.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/gridengine
-ExecStart=/usr/bin/sge_qmaster
-# If running under a different cell, copy this file to /etc/systemd/system/sgemaster.service
-# and change default below to the cell name
-PIDFile=/var/spool/gridengine/default/qmaster/qmaster.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sources b/sources
deleted file mode 100644
index 7fd8e40..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-5ba34d534cdeda9afe74cd367cb51ce0 gridengine-ppc.tar.gz
-a10b1e8f8677295fdbd55ecf7c8b785a GE2011.11p1.tar.gz
6 years, 10 months
Architecture specific change in rpms/gpick.git
by githook-noreply@fedoraproject.org
The package rpms/gpick.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gpick.git/commit/?id=a5ff857c3b8f....
Change:
+ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x
Thanks.
Full change:
============
commit a5ff857c3b8f747c3ba1658888755d7105102da3
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Fri Aug 18 12:09:54 2017 -0700
Rebuilt for boost
Exclude s390x arch
diff --git a/gpick.spec b/gpick.spec
index 6f85bec..01a3eca 100644
--- a/gpick.spec
+++ b/gpick.spec
@@ -32,7 +32,7 @@ BuildRequires: scons
# Regression on other arches with F26 mass rebuild
# Temporarily exclude them
# https://bugzilla.redhat.com/show_bug.cgi?id=1419949
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
+ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x
%description
Advanced color picker
@@ -91,6 +91,7 @@ fi
%changelog
* Fri Aug 18 2017 Luya Tshimbalanga <luya_tfz(a)thefinalzone.net> - 0.2.5-21.20170217git
- Rebuilt for boost
+- Exclude s390x arch
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.5-20.20170217git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 10 months
Architecture specific change in rpms/gpick.git
by githook-noreply@fedoraproject.org
The package rpms/gpick.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gpick.git/commit/?id=a5ff857c3b8f....
Change:
+ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x
Thanks.
Full change:
============
commit a5ff857c3b8f747c3ba1658888755d7105102da3
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Fri Aug 18 12:09:54 2017 -0700
Rebuilt for boost
Exclude s390x arch
diff --git a/gpick.spec b/gpick.spec
index 6f85bec..01a3eca 100644
--- a/gpick.spec
+++ b/gpick.spec
@@ -32,7 +32,7 @@ BuildRequires: scons
# Regression on other arches with F26 mass rebuild
# Temporarily exclude them
# https://bugzilla.redhat.com/show_bug.cgi?id=1419949
-ExcludeArch: ppc64 ppc64le aarch64 armv7hl
+ExcludeArch: ppc64 ppc64le aarch64 armv7hl s390x
%description
Advanced color picker
@@ -91,6 +91,7 @@ fi
%changelog
* Fri Aug 18 2017 Luya Tshimbalanga <luya_tfz(a)thefinalzone.net> - 0.2.5-21.20170217git
- Rebuilt for boost
+- Exclude s390x arch
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.5-20.20170217git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
6 years, 10 months
Architecture specific change in rpms/ceph.git
by githook-noreply@fedoraproject.org
The package rpms/ceph.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=30b06a8179612....
Change:
+%ifnarch ppc64le
Thanks.
Full change:
============
commit 30b06a817961249da626d69fb0deb58a53772d23
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Fri Aug 18 09:25:01 2017 -0400
fix %epoch in comment, ppc64le lowmem_builder
diff --git a/ceph.spec b/ceph.spec
index 3307dc0..c709589 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -36,8 +36,16 @@
%ifnarch armv7hl
%bcond_with lowmem_builder
%else
+%if 0%{?rhel}
+%ifnarch ppc64le
+%bcond_with lowmem_builder
+%else
+%bcond_without lowmem_builder
+%endif
+%else
%bcond_without lowmem_builder
%endif
+%endif
%if 0%{?fedora} || 0%{?rhel}
%bcond_without selinux
%endif
@@ -77,13 +85,13 @@
# main package definition
#################################################################################
Name: ceph
-Version: 12.1.3
-Release: 1%{?dist}
+Version: 12.1.4
+Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif
-# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
+# define %%_epoch_prefix macro which will expand to the empty string if %%epoch is undefined
%global _epoch_prefix %{?epoch:%{epoch}:}
Summary: User space components of the Ceph file system
@@ -1784,6 +1792,12 @@ exit 0
%changelog
+* Thu Aug 17 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-2
+- fix %%epoch in comment, ppc64le lowmem_builder
+
+* Wed Aug 16 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.4-1
+- New release (1:12.1.4-1)
+
* Sat Aug 12 2017 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.1.3-1
- New release (1:12.1.3-1)
diff --git a/sources b/sources
index 9b75234..cc5abc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.1.3.tar.gz) = 989bda3ad64df23fc7a3efd1db1922f17de0fca837f0d37f5e953433519070c609fcbd74a3c862ae06f6a862527aa3ece7c7d1a8c8d62649800087287508e423
+SHA512 (ceph-12.1.4.tar.gz) = be4d11ec3aa47ccc7c31e81dec7db913e68d344e3594baefb87ddc4ca58b3eba00f42a8b34454e6ef8145bed790280788487278bedf67b65616f4e387f09d170
6 years, 10 months
Architecture specific change in rpms/libibumad.git
by githook-noreply@fedoraproject.org
The package rpms/libibumad.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libibumad.git/commit/?id=a5078980....
Change:
-ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit a507898022a3ccfcc401525a201b48cf3065012c
Author: Honggang Li <honli(a)redhat.com>
Date: Fri Aug 18 08:01:52 2017 -0400
Obsoleted by rdma-core
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 37f5aae..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-i386/
-i686/
-x86_64/
-ppc/
-ppc64/
-ia64/
-mips/
-arm*/
-noarch/
-.project
-*.src.rpm
-.build*.log
-/libibumad-1.*.tar.gz
-/libibumad-1.*/
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..f0a7220
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Obsoleted by rdma-core
diff --git a/libibumad.spec b/libibumad.spec
deleted file mode 100644
index 1180842..0000000
--- a/libibumad.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-%global __remake_config 0
-
-Summary: OpenFabrics Alliance InfiniBand umad (user MAD) library
-Name: libibumad
-Version: 1.3.10.2
-Release: 4%{?dist}
-License: GPLv2 or BSD
-Group: System Environment/Libraries
-Url: https://www.openfabrics.org
-Source: https://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%if %{__remake_config}
-BuildRequires: libtool, automake, autoconf
-%endif
-BuildRequires: glibc-static
-ExcludeArch: s390 s390x
-
-%description
-libibumad provides the user MAD library functions which sit on top of
-the user MAD modules in the kernel. These are used by the IB diagnostic
-and management tools, including OpenSM.
-
-%package devel
-Summary: Development files for the libibumad library
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Development files for the libibumad library.
-
-%package static
-Summary: Static version of the libibumad library
-Group: System Environment/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static version of the libibumad library.
-
-%prep
-%setup -q
-
-%build
-%if %{__remake_config}
-./autogen.sh
-%endif
-%configure
-make %{?_smp_mflags}
-
-%install
-make DESTDIR=%{buildroot} install
-# remove unpackaged files from the buildroot
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%files
-%{_libdir}/libibumad*.so.*
-%{_mandir}/man3/*
-%doc AUTHORS COPYING ChangeLog
-
-%files devel
-%{_libdir}/libibumad.so
-%{_includedir}/infiniband/*.h
-
-%files static
-%{_libdir}/libibumad.a
-
-%changelog
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.10.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.10.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.10.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Mar 15 2016 Doug Ledford <dledford(a)redhat.com> - 1.3.10.2-1
-- Update to latest upstream version
-- Pick up the version needed to support OPA fabrics
-- Resolves: bz1175172, bz1312134
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.9-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Mar 17 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.3.9-1
-- Update to 1.3.9
-- Cleanup and modernise spec
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Nov 27 2012 Doug Ledford <dledford(a)redhat.com> - 1.3.8-1
-- Update to latest upstream version
-- Fix Url tag
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Jul 20 2011 Doug Ledford <dledford(a)redhat.com> - 1.3.7-1
-- Update to latest upstream source
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sat Feb 27 2010 Doug Ledford <dledford(a)redhat.com> - 1.3.4-1
-- New upstream release
-
-* Mon Jan 11 2010 Doug Ledford <dledford(a)redhat.com> - 1.3.3-2
-- ExcludeArch s390(x) as there is no hardware support there
-
-* Thu Dec 03 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.3-1
-- Update to latest upstream version
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jul 20 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.2-2
-- Forgot to remove both instances of the libibcommon requires
-- Add build requires on glibc-static
-
-* Mon Jul 20 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.2-1
-- Update to latest upstream version
-- Remove requirement on libibcommon since that library is no longer needed
-- Fix a problem with man page listing
-
-* Wed Apr 22 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.1-1
-- Update to latest upstream version
-
-* Sat Mar 21 2009 Robert Scheck <robert(a)fedoraproject.org> - 1.2.0-3
-- Rebuilt against libtool 2.2
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 1.2.0-1
-- Initial package for Fedora review process
diff --git a/sources b/sources
deleted file mode 100644
index b94e584..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-dd017844c55713bd335aa229e6841d41 libibumad-1.3.10.2.tar.gz
6 years, 10 months
Architecture specific change in rpms/libibumad.git
by githook-noreply@fedoraproject.org
The package rpms/libibumad.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libibumad.git/commit/?id=41e698f5....
Change:
-ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit 41e698f546d10a86cced3aa4601a8daaf9c0926f
Author: Honggang Li <honli(a)redhat.com>
Date: Fri Aug 18 08:01:29 2017 -0400
Obsoleted by rdma-core
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 37f5aae..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-i386/
-i686/
-x86_64/
-ppc/
-ppc64/
-ia64/
-mips/
-arm*/
-noarch/
-.project
-*.src.rpm
-.build*.log
-/libibumad-1.*.tar.gz
-/libibumad-1.*/
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..f0a7220
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Obsoleted by rdma-core
diff --git a/libibumad.spec b/libibumad.spec
deleted file mode 100644
index 1180842..0000000
--- a/libibumad.spec
+++ /dev/null
@@ -1,154 +0,0 @@
-%global __remake_config 0
-
-Summary: OpenFabrics Alliance InfiniBand umad (user MAD) library
-Name: libibumad
-Version: 1.3.10.2
-Release: 4%{?dist}
-License: GPLv2 or BSD
-Group: System Environment/Libraries
-Url: https://www.openfabrics.org
-Source: https://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%if %{__remake_config}
-BuildRequires: libtool, automake, autoconf
-%endif
-BuildRequires: glibc-static
-ExcludeArch: s390 s390x
-
-%description
-libibumad provides the user MAD library functions which sit on top of
-the user MAD modules in the kernel. These are used by the IB diagnostic
-and management tools, including OpenSM.
-
-%package devel
-Summary: Development files for the libibumad library
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Development files for the libibumad library.
-
-%package static
-Summary: Static version of the libibumad library
-Group: System Environment/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static version of the libibumad library.
-
-%prep
-%setup -q
-
-%build
-%if %{__remake_config}
-./autogen.sh
-%endif
-%configure
-make %{?_smp_mflags}
-
-%install
-make DESTDIR=%{buildroot} install
-# remove unpackaged files from the buildroot
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%files
-%{_libdir}/libibumad*.so.*
-%{_mandir}/man3/*
-%doc AUTHORS COPYING ChangeLog
-
-%files devel
-%{_libdir}/libibumad.so
-%{_includedir}/infiniband/*.h
-
-%files static
-%{_libdir}/libibumad.a
-
-%changelog
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.10.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.10.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.10.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Mar 15 2016 Doug Ledford <dledford(a)redhat.com> - 1.3.10.2-1
-- Update to latest upstream version
-- Pick up the version needed to support OPA fabrics
-- Resolves: bz1175172, bz1312134
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.9-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Mar 17 2014 Peter Robinson <pbrobinson(a)fedoraproject.org> 1.3.9-1
-- Update to 1.3.9
-- Cleanup and modernise spec
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Nov 27 2012 Doug Ledford <dledford(a)redhat.com> - 1.3.8-1
-- Update to latest upstream version
-- Fix Url tag
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Jul 20 2011 Doug Ledford <dledford(a)redhat.com> - 1.3.7-1
-- Update to latest upstream source
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sat Feb 27 2010 Doug Ledford <dledford(a)redhat.com> - 1.3.4-1
-- New upstream release
-
-* Mon Jan 11 2010 Doug Ledford <dledford(a)redhat.com> - 1.3.3-2
-- ExcludeArch s390(x) as there is no hardware support there
-
-* Thu Dec 03 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.3-1
-- Update to latest upstream version
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jul 20 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.2-2
-- Forgot to remove both instances of the libibcommon requires
-- Add build requires on glibc-static
-
-* Mon Jul 20 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.2-1
-- Update to latest upstream version
-- Remove requirement on libibcommon since that library is no longer needed
-- Fix a problem with man page listing
-
-* Wed Apr 22 2009 Doug Ledford <dledford(a)redhat.com> - 1.3.1-1
-- Update to latest upstream version
-
-* Sat Mar 21 2009 Robert Scheck <robert(a)fedoraproject.org> - 1.2.0-3
-- Rebuilt against libtool 2.2
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 1.2.0-1
-- Initial package for Fedora review process
diff --git a/sources b/sources
deleted file mode 100644
index b94e584..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-dd017844c55713bd335aa229e6841d41 libibumad-1.3.10.2.tar.gz
6 years, 10 months
Architecture specific change in rpms/libibcm.git
by githook-noreply@fedoraproject.org
The package rpms/libibcm.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libibcm.git/commit/?id=26a67c3af1....
Change:
-ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit 26a67c3af1978fe6ee3acbeb2bac3d4e0db32328
Author: Honggang Li <honli(a)redhat.com>
Date: Fri Aug 18 08:00:16 2017 -0400
Obsoleted by rdma-core
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ea7715d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-i386/
-i686/
-x86_64/
-ppc/
-ppc64/
-ia64/
-mips/
-arm*/
-noarch/
-.project
-*.src.rpm
-.build*.log
-libibcm-1.0.2.tar.gz
-libibcm-1.0.5.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..f0a7220
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Obsoleted by rdma-core
diff --git a/libibcm.spec b/libibcm.spec
deleted file mode 100644
index d8a0725..0000000
--- a/libibcm.spec
+++ /dev/null
@@ -1,117 +0,0 @@
-Name: libibcm
-Version: 1.0.5
-Release: 17%{?dist}
-Summary: Userspace InfiniBand Connection Manager
-Group: System Environment/Libraries
-License: GPLv2 or BSD
-Url: http://www.openfabrics.org/
-Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
-BuildRequires: libibverbs-devel >= 1.2.0, autoconf, automake, libtool
-ExcludeArch: s390 s390x
-%description
-libibcm provides a userspace library that handles the majority of the low
-level work required to open an RDMA connection between two machines.
-
-%package devel
-Summary: Development files for the libibcm library
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}, libibverbs-devel >= 1.2.0
-%description devel
-Development files for the libibcm library.
-
-%package static
-Summary: Static version of libibcm libraries
-Group: System Environment/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-%description static
-Static version of libibcm library.
-
-%prep
-%setup -q
-
-%build
-autoreconf -i
-%configure
-make %{?_smp_mflags}
-
-%install
-%makeinstall
-# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%files
-%{_libdir}/libibcm*.so.*
-%doc AUTHORS README
-%license COPYING
-
-%files devel
-%{_libdir}/lib*.so
-%{_includedir}/*
-
-%files static
-%{_libdir}/*.a
-
-%changelog
-* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.5-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.5-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.5-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Mar 30 2016 Honggang Li <honli(a)redhat.com> - 1.0.5-14
-- Minor fixes
-- Rebuild against latest libibverbs
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.5-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Aug 09 2013 Doug Ledford <dledford(a)redhat.com> - 1.0.5-9
-- Use autoreconf on build so arm will build properly (bz925762)
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Jul 20 2011 Doug Ledford <dledford(a)redhat.com> - 1.0.5-4
-- Bump and rebuild against latest libibverbs
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jan 11 2010 Doug Ledford <dledford(a)redhat.com> - 1.0.5-2
-- Switch from ExclusiveArch with a big list to ExcludeArch with a small list
-
-* Thu Dec 03 2009 Doug Ledford <dledford(a)redhat.com> - 1.0.5-1
-- Update to latest upstream version
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Jun 08 2008 Doug Ledford <dledford(a)redhat.com> - 1.0.2-1
-- Initial package for submission to Fedora review process
diff --git a/sources b/sources
deleted file mode 100644
index a213c9d..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-7ede8d7e96d6a65f09f289767bd931ea libibcm-1.0.5.tar.gz
6 years, 10 months