From 08f344b00c8ac25867a46974e9bc7254960890da Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 16 Feb 2021 11:33:39 +0100
Subject: [PATCH 1/4] dtool: Fix memory leak in OEncryptStream/IDecryptStream

Fixes #1114
---
 dtool/src/prc/encryptStreamBuf.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dtool/src/prc/encryptStreamBuf.cxx b/dtool/src/prc/encryptStreamBuf.cxx
index fe562e59e6..a8e7c04967 100644
--- a/dtool/src/prc/encryptStreamBuf.cxx
+++ b/dtool/src/prc/encryptStreamBuf.cxx
@@ -95,6 +95,10 @@ EncryptStreamBuf::
 ~EncryptStreamBuf() {
   close_read();
   close_write();
+
+#ifdef PHAVE_IOSTREAM
+  delete[] eback();
+#endif
 }
 
 /**

From 059361c87c42e98051cffffd5eef112c897ef236 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 16 Feb 2021 11:49:53 +0100
Subject: [PATCH 2/4] makepanda: Locate aarch64 thirdparty packages on
 Linux/FreeBSD

[skip ci]
---
 makepanda/makepandacore.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index 9cac107de1..c6dd9f0e91 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -1342,6 +1342,8 @@ def GetThirdpartyDir():
             THIRDPARTYDIR = base + "/linux-libs-arm/"
         elif (target_arch in ("x86_64", "amd64")):
             THIRDPARTYDIR = base + "/linux-libs-x64/"
+        elif target_arch == "aarch64":
+            THIRDPARTYDIR = base + "/linux-libs-aarch64/"
         else:
             THIRDPARTYDIR = base + "/linux-libs-a/"
 
@@ -1350,6 +1352,8 @@ def GetThirdpartyDir():
             THIRDPARTYDIR = base + "/freebsd-libs-arm/"
         elif (target_arch in ("x86_64", "amd64")):
             THIRDPARTYDIR = base + "/freebsd-libs-x64/"
+        elif target_arch == "aarch64":
+            THIRDPARTYDIR = base + "/freebsd-libs-aarch64/"
         else:
             THIRDPARTYDIR = base + "/freebsd-libs-a/"
 

From 17341b18ed06a50f83189a3d18aecb7ff344c0c8 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 16 Feb 2021 12:33:30 +0100
Subject: [PATCH 3/4] dist: Add PACKAGE_DATA_DIRS entry for pytz zoneinfo
 database

---
 direct/src/dist/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py
index f430a2b2dc..68d01d97ce 100644
--- a/direct/src/dist/commands.py
+++ b/direct/src/dist/commands.py
@@ -112,6 +112,7 @@ PACKAGE_DATA_DIRS = {
         ('cefpython3/Chromium Embedded Framework.framework/Resources', 'Chromium Embedded Framework.framework/Resources', {}),
         ('cefpython3/Chromium Embedded Framework.framework/Chromium Embedded Framework', '', {'PKG_DATA_MAKE_EXECUTABLE'}),
     ],
+    'pytz': [('pytz/zoneinfo/*', 'zoneinfo', ())],
 }
 
 # Some dependencies have extra directories that need to be scanned for DLLs.

From 3592404fa891943a5e38e62bd52976deb02e7dbe Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 17 Feb 2021 10:55:20 +0100
Subject: [PATCH 4/4] display: Fix GraphicsWindow::get_pointer() listed as
 deprecated

[skip ci]
---
 panda/src/display/graphicsWindow.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx
index ad27b2ac46..f55cd06f66 100644
--- a/panda/src/display/graphicsWindow.cxx
+++ b/panda/src/display/graphicsWindow.cxx
@@ -353,9 +353,9 @@ disable_pointer_mode(int device) {
 }*/
 
 /**
- * Returns the MouseData associated with the nth input device's pointer.  This
- * is deprecated; use get_pointer_device().get_pointer() instead, or for raw
- * mice, use the InputDeviceManager interface.
+ * Returns the MouseData associated with the nth input device's pointer.
+ * Using this to access raw mice (with an index other than 0) is deprecated,
+ * see the InputDeviceManager interface instead.
  */
 MouseData GraphicsWindow::
 get_pointer(int device) const {