From 6a6ecaad417fa26d66d2417259ab1e79a41af3b1 Mon Sep 17 00:00:00 2001
From: Himanshu Jain <hjain@perforce.com>
Date: Wed, 7 Feb 2024 05:59:37 -0600
Subject: [PATCH] 2023.2 patch 1 release code drop

Made P4Exception object pickleable.
---
 P4.py        |  9 ++++++++-
 RELNOTES.txt | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/P4.py b/P4.py
index 4855f85..5a7c8c0 100755
--- a/P4.py
+++ b/P4.py
@@ -7,7 +7,7 @@
     This uses the Python type P4API.P4Adapter, which is a wrapper for the
     Perforce ClientApi object.
     
-    $Id: //depot/main/p4-python/P4.py#109 $
+    $Id: //depot/main/p4-python/P4.py#110 $
     
     #*******************************************************************************
     # Copyright (c) 2007-2010, Perforce Software, Inc.  All rights reserved.
@@ -64,9 +64,16 @@ def __init__(self, value):
             self.warnings = value[2]
         else:
             self.value = value
+
     def __str__(self):
         return str(self.value)
 
+    def __reduce__(self):
+        if hasattr(self, 'errors'):
+            return (self.__class__, ((self.value, self.errors, self.warnings),))
+        return (self.__class__, (self.value,))
+
+
 class Spec(dict):
     """Subclass of dict, representing the fields of a spec definition.
         
diff --git a/RELNOTES.txt b/RELNOTES.txt
index 3bf05d5..77ac576 100644
--- a/RELNOTES.txt
+++ b/RELNOTES.txt
@@ -294,6 +294,17 @@ Key to symbols used in change notes below.
 
 --------------------------------------------------------------------------
 
+New functionality in 2023.2 Patch 1 (2023.2/2543803) (2024/01/22)
+        
+    (Job #118907)
+        This release is built against P4API (2023.2/2519561),
+        to address possible vulnerability: CVE-2023-5759.
+
+    #2542109 (Job #117135)
+        Made P4Exception object pickleable.
+
+--------------------------------------------------------------------------
+
 New functionality in 2023.2 (2023.2/2527637) (2023/12/04)
 
     #2522046 (Job #117813)
@@ -335,6 +346,14 @@ New functionality in 2023.1 (2023.1/2454917) (2023/06/15)
     
 --------------------------------------------------------------------------
 
+New functionality in 2022.2 Patch 2 (2022.2/2543766) (2024/01/18)
+        
+    (Job #118907)
+        This release is built against P4API (2022.2/2531894),
+        to address possible vulnerability: CVE-2023-5759.
+
+--------------------------------------------------------------------------
+
 New functionality in 2022.2 Patch 1 (2022.2/2428370) (2023/04/13)
 
     #2427292 (Job #113073)