@@ -1,7 +1,7 @@

 Name:           WALinuxAgent

 Summary:        The Windows Azure Linux Agent

 Version:        2.2.49.2

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        Apache License Version 2.0

 Group:          System/Daemons

 Url:            https://github.com/Azure/WALinuxAgent

@@ -76,9 +76,11 @@ python3 setup.py check && python3 setup.py test

 %{_localstatedir}/log/waagent.log

 %ghost %{_localstatedir}/opt/waagent/log/waagent.log

 %dir %attr(0700, root, root) %{_sharedstatedir}/waagent

-/usr/lib/python3.8/site-packages/*

+/usr/lib/python3.9/site-packages/*

 %changelog

+* Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 2.2.49.2-3

+- Build with python 3.9

 * Tue Sep 29 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 2.2.49.2-2

 - openssl 1.1.1

 * Fri Aug 28 2020 Gerrit Photon <photon-checkins@vmware.com> 2.2.49.2-1

@@ -1,7 +1,7 @@

 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

 Name:           apparmor

 Version:        3.0.0

-Release:        2%{?dist}

+Release:        3%{?dist}

 Summary:        AppArmor is an effective and easy-to-use Linux application security system.

 License:        GNU LGPL v2.1

 URL:            https://launchpad.net/apparmor

@@ -194,9 +194,9 @@ make %{?_smp_mflags}

 %check

 easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)

 $easy_install_3 pyflakes

-export PYTHONPATH=/usr/lib/python3.8/site-packages

+export PYTHONPATH=/usr/lib/python3.9/site-packages

 export PYTHON=/usr/bin/python3

-export PYTHON_VERSION=3.8

+export PYTHON_VERSION=3.9

 export PYTHON_VERSIONS=python3

 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/"

 cd ./libraries/libapparmor

@@ -207,9 +207,9 @@ cd ../utils

 make check

 %install

-export PYTHONPATH=/usr/lib/python3.8/site-packages

+export PYTHONPATH=/usr/lib/python3.9/site-packages

 export PYTHON=/usr/bin/python3

-export PYTHON_VERSION=3.8

+export PYTHON_VERSION=3.9

 export PYTHON_VERSIONS=python3

 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/"

 cd libraries/libapparmor

@@ -352,6 +352,8 @@ make DESTDIR=%{buildroot} install

 %exclude %{perl_archlib}/perllocal.pod

 %changelog

+*   Fri Nov 06 2020 Tapas Kundu <tkundu@vmware.com> 3.0.0-3

+-   Build with python 3.9

 *   Fri Oct 23 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 3.0.0-2

 -   Fix build failure in apparmor on linux 5.9-rc7

 *   Thu Oct 01 2020 Gerrit Photon <photon-checkins@vmware.com> 3.0.0-1

@@ -1,8 +1,8 @@

-%define python3_sitelib /usr/lib/python3.8/site-packages

+%define python3_sitelib /usr/lib/python3.9/site-packages

 Name:           cloud-init

 Version:        20.3

-Release:        2%{?dist}

+Release:        3%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -156,6 +156,8 @@ rm -rf $RPM_BUILD_ROOT

 %dir /var/lib/cloud

 %changelog

+*   Fri Nov 06 2020 Tapas Kundu <tkundu@vmware.com> 20.3-3

+-   Updated using python 3.9 lib

 *   Mon Oct 12 2020 Shreenidhi Shedi <sshedi@vmware.com> 20.3-2

 -   Fixed subp import in photon.py

 -   Fixed creating `[Route]` entries while creating network files

@@ -1,13 +1,13 @@

 %{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

 Summary:        C extensions for Python3

 Name:           cython3

-Version:        0.29.21

-Release:        2%{?dist}

+Version:        3.0a6

+Release:        1%{?dist}

 Group:          Development/Libraries

 License:        Apache License

 URL:            http://cython.org/

 Source0:        https://github.com/cython/cython/archive/Cython-%{version}.tar.gz

-%define sha1 Cython=718dcfee83132421e2df4eb6fa0ef7f3917bf7b9

+%define sha1 Cython=2c902b732ca14d07999fca6aa2c80d5d6ceabb8c

 Patch0:         fix_make_check_tests.patch

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -25,7 +25,6 @@ It makes writing C extensions for Python as easy as Python itself.

 %prep

 %setup -q -n cython-%{version}

 %patch0 -p1

-

 %build

 python3 setup.py build

@@ -52,6 +51,8 @@ rm -rf %{buildroot}

 %{python3_sitelib}/__pycache__/*

 %changelog

+*   Wed Oct 14 2020 Tapas Kundu <tkundu@vmware.com> 3.0a6-1

+-   Update to 3.0a6

 *   Mon Jul 27 2020 Tapas Kundu <tkundu@vmware.com> 0.29.21-2

 -   Build with python3

 *   Thu Jul 09 2020 Gerrit Photon <photon-checkins@vmware.com> 0.29.21-1

@@ -1,7 +1,7 @@

 Summary:    Talloc is a hierarchical, reference counted memory pool system

 Name:       libtalloc

 Version:    2.3.1

-Release:    3%{?dist}

+Release:    4%{?dist}

 License:    LGPLv3+

 URL:        https://talloc.samba.org

 Group:      System Environment/Libraries

@@ -73,29 +73,31 @@ make check

 %files -n python3-talloc

 %defattr(-,root,root)

-%{_libdir}/python3.8/site-packages/*

+%{_libdir}/python3.9/site-packages/*

 %ifarch x86_64

-%{_libdir}/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2

-%{_libdir}/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2.3.1

+%{_libdir}/libpytalloc-util.cpython-39-x86-64-linux-gnu.so.2

+%{_libdir}/libpytalloc-util.cpython-39-x86-64-linux-gnu.so.2.3.1

 %endif

 %ifarch aarch64

-%{_libdir}/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2

-%{_libdir}/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.1

+%{_libdir}/libpytalloc-util.cpython-39-aarch64-linux-gnu.so.2

+%{_libdir}/libpytalloc-util.cpython-39-aarch64-linux-gnu.so.2.3.1

 %endif

 %files -n python3-talloc-devel

 %defattr(-,root,root)

 %{_includedir}/pytalloc.h

 %ifarch x86_64

-%{_libdir}/libpytalloc-util.cpython-38-x86-64-linux-gnu.so

-%{_libdir}/pkgconfig/pytalloc-util.cpython-38-x86_64-linux-gnu.pc

+%{_libdir}/libpytalloc-util.cpython-39-x86-64-linux-gnu.so

+%{_libdir}/pkgconfig/pytalloc-util.cpython-39-x86_64-linux-gnu.pc

 %endif

 %ifarch aarch64

-%{_libdir}/libpytalloc-util.cpython-38-aarch64-linux-gnu.so

-%{_libdir}/pkgconfig/pytalloc-util.cpython-38-aarch64-linux-gnu.pc

+%{_libdir}/libpytalloc-util.cpython-39-aarch64-linux-gnu.so

+%{_libdir}/pkgconfig/pytalloc-util.cpython-39-aarch64-linux-gnu.pc

 %endif

 %changelog

+*   Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 2.3.1-4

+-   Build with python 3.9

 *   Wed Jul 29 2020 Tapas Kundu <tkundu@vmware.com> 2.3.1-3

 -   Build with python3

 *   Fri Jul 24 2020 Tapas Kundu <tkundu@vmware.com> 2.3.1-2

new file mode 100644

@@ -0,0 +1,91 @@

+From edc7b6abb0c125eeb888748c334897f60aab0854 Mon Sep 17 00:00:00 2001

+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

+Date: Fri, 28 Feb 2020 12:48:14 +0100

+Subject: [PATCH] Parenthesize Py<type>_Check() in ifs

+

+In C, if expressions should be parenthesized.

+PyLong_Check, PyUnicode_Check etc. happened to expand to a parenthesized

+expression before, but that's not API to rely on.

+

+Since Python 3.9.0a4 it needs to be parenthesized explicitly.

+

+Fixes https://gitlab.gnome.org/GNOME/libxml2/issues/149

+---

+ python/libxml.c |  4 ++--

+ python/types.c  | 12 ++++++------

+ 2 files changed, 8 insertions(+), 8 deletions(-)

+

+diff --git a/python/libxml.c b/python/libxml.c

+index bc676c4e0..81e709f34 100644

+--- a/python/libxml.c

+@@ -294,7 +294,7 @@ xmlPythonFileReadRaw (void * context, char * buffer, int len) {

+ 	lenread = PyBytes_Size(ret);

+ 	data = PyBytes_AsString(ret);

+ #ifdef PyUnicode_Check

+-    } else if PyUnicode_Check (ret) {

++    } else if (PyUnicode_Check (ret)) {

+ #if PY_VERSION_HEX >= 0x03030000

+         Py_ssize_t size;

+ 	const char *tmp;

+@@ -359,7 +359,7 @@ xmlPythonFileRead (void * context, char * buffer, int len) {

+ 	lenread = PyBytes_Size(ret);

+ 	data = PyBytes_AsString(ret);

+ #ifdef PyUnicode_Check

+-    } else if PyUnicode_Check (ret) {

++    } else if (PyUnicode_Check (ret)) {

+ #if PY_VERSION_HEX >= 0x03030000

+         Py_ssize_t size;

+ 	const char *tmp;

+diff --git a/python/types.c b/python/types.c

+index c2bafeb19..ed284ec74 100644

+--- a/python/types.c

+@@ -602,16 +602,16 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)

+     if (obj == NULL) {

+         return (NULL);

+     }

+-    if PyFloat_Check (obj) {

++    if (PyFloat_Check (obj)) {

+         ret = xmlXPathNewFloat((double) PyFloat_AS_DOUBLE(obj));

+-    } else if PyLong_Check(obj) {

++    } else if (PyLong_Check(obj)) {

+ #ifdef PyLong_AS_LONG

+         ret = xmlXPathNewFloat((double) PyLong_AS_LONG(obj));

+ #else

+         ret = xmlXPathNewFloat((double) PyInt_AS_LONG(obj));

+ #endif

+ #ifdef PyBool_Check

+-    } else if PyBool_Check (obj) {

++    } else if (PyBool_Check (obj)) {

+ 

+         if (obj == Py_True) {

+           ret = xmlXPathNewBoolean(1);

+@@ -620,14 +620,14 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)

+           ret = xmlXPathNewBoolean(0);

+         }

+ #endif

+-    } else if PyBytes_Check (obj) {

++    } else if (PyBytes_Check (obj)) {

+         xmlChar *str;

+ 

+         str = xmlStrndup((const xmlChar *) PyBytes_AS_STRING(obj),

+                          PyBytes_GET_SIZE(obj));

+         ret = xmlXPathWrapString(str);

+ #ifdef PyUnicode_Check

+-    } else if PyUnicode_Check (obj) {

++    } else if (PyUnicode_Check (obj)) {

+ #if PY_VERSION_HEX >= 0x03030000

+         xmlChar *str;

+ 	const char *tmp;

+@@ -650,7 +650,7 @@ libxml_xmlXPathObjectPtrConvert(PyObject *obj)

+ 	ret = xmlXPathWrapString(str);

+ #endif

+ #endif

+-    } else if PyList_Check (obj) {

++    } else if (PyList_Check (obj)) {

+         int i;

+         PyObject *node;

+         xmlNodePtr cur;

+-- 

+GitLab

@@ -3,7 +3,7 @@

 Summary:        Libxml2

 Name:           libxml2

 Version:        2.9.10

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        MIT

 URL:            http://xmlsoft.org/

 Group:          System Environment/General Libraries

@@ -13,6 +13,7 @@ Source0:        ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz

 %define sha1    libxml2=db6592ec9ca9708c4e71bf6bfd907bbb5cd40644

 Patch0:         CVE-2020-7595.patch

 Patch1:         CVE-2020-24977.patch

+Patch2:         fix_build_with_python3.9.patch

 BuildRequires:  python3-devel

 BuildRequires:  python3-libs

 BuildRequires:  python3-devel

@@ -41,6 +42,7 @@ Static libraries and header files for the support library for libxml

 %setup -q

 %patch0 -p1

 %patch1 -p1

+%patch2 -p1

 %build

 %configure \

@@ -91,6 +93,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/cmake/libxml2/libxml2-config.cmake

 %changelog

+*   Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 2.9.10-4

+-   Fix build with python 3.9

 *   Tue Sep 15 2020 Prashant S Chauhan <psinghchauha@vmware.com> 2.9.10-3

 -   Fix for CVE-2020-24977(Fix Buffer Overflow vulnerability)

 *   Sat Jun 20 2020 Tapas Kundu <tkundu@vmware.com> 2.9.10-2

@@ -5,7 +5,7 @@

      ],

      [

 -        PYTHON_INCLUDES="-I$PYTHON_BASE_PATH/include/python2.7"

-+        PYTHON_INCLUDES="-I$PYTHON_BASE_PATH/include/python3.8"

++        PYTHON_INCLUDES="-I$PYTHON_BASE_PATH/include/python3.9"

      ])

  AC_ARG_WITH([python-libs],

new file mode 100644

@@ -0,0 +1,75 @@

+From d0e7b0c71fbb653de90a7163ef46912a96f0bdaf Mon Sep 17 00:00:00 2001

+From: Arnaldo Carvalho de Melo <acme@redhat.com>

+Date: Fri, 30 Oct 2020 08:24:38 -0300

+Subject: [PATCH] perf scripting python: Avoid declaring function pointers with

+ a visibility attribute

+

+To avoid this:

+

+  util/scripting-engines/trace-event-python.c: In function 'python_start_script':

+  util/scripting-engines/trace-event-python.c:1595:2: error: 'visibility' attribute ignored [-Werror=attributes]

+   1595 |  PyMODINIT_FUNC (*initfunc)(void);

+        |  ^~~~~~~~~~~~~~

+

+That started breaking when building with PYTHON=python3 and these gcc

+versions (I haven't checked with the clang ones, maybe it breaks there

+as well):

+

+  # export PERF_TARBALL=http://192.168.86.5/perf/perf-5.9.0.tar.xz

+  # dm  fedora:33 fedora:rawhide

+     1   107.80 fedora:33         : Ok   gcc (GCC) 10.2.1 20201005 (Red Hat 10.2.1-5), clang version 11.0.0 (Fedora 11.0.0-1.fc33)

+     2    92.47 fedora:rawhide    : Ok   gcc (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6), clang version 11.0.0 (Fedora 11.0.0-1.fc34)

+  #

+

+Avoid that by ditching that 'initfunc' function pointer with its:

+

+    #define Py_EXPORTED_SYMBOL _attribute_ ((visibility ("default")))

+    #define PyMODINIT_FUNC Py_EXPORTED_SYMBOL PyObject*

+

+And just call PyImport_AppendInittab() at the end of the ifdef python3

+block with the functions that were being attributed to that initfunc.

+

+Cc: Adrian Hunter <adrian.hunter@intel.com>

+Cc: Ian Rogers <irogers@google.com>

+Cc: Jiri Olsa <jolsa@kernel.org>

+Cc: Namhyung Kim <namhyung@kernel.org>

+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+---

+ tools/perf/util/scripting-engines/trace-event-python.c | 7 ++-----

+ 1 file changed, 2 insertions(+), 5 deletions(-)

+

+diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c

+index 7cbd024e3e634..c83c2c6564e01 100644

+--- a/tools/perf/util/scripting-engines/trace-event-python.c

+@@ -1592,7 +1592,6 @@ static void _free_command_line(wchar_t **command_line, int num)

+ static int python_start_script(const char *script, int argc, const char **argv)

+ {

+ 	struct tables *tables = &tables_global;

+-	PyMODINIT_FUNC (*initfunc)(void);

+ #if PY_MAJOR_VERSION < 3

+ 	const char **command_line;

+ #else

+@@ -1607,20 +1606,18 @@ static int python_start_script(const char *script, int argc, const char **argv)

+ 	FILE *fp;

+ 

+ #if PY_MAJOR_VERSION < 3

+-	initfunc = initperf_trace_context;

+ 	command_line = malloc((argc + 1) * sizeof(const char *));

+ 	command_line[0] = script;

+ 	for (i = 1; i < argc + 1; i++)

+ 		command_line[i] = argv[i - 1];

++	PyImport_AppendInittab(name, initperf_trace_context);

+ #else

+-	initfunc = PyInit_perf_trace_context;

+ 	command_line = malloc((argc + 1) * sizeof(wchar_t *));

+ 	command_line[0] = Py_DecodeLocale(script, NULL);

+ 	for (i = 1; i < argc + 1; i++)

+ 		command_line[i] = Py_DecodeLocale(argv[i - 1], NULL);

++	PyImport_AppendInittab(name, PyInit_perf_trace_context);

+ #endif

+-

+-	PyImport_AppendInittab(name, initfunc);

+ 	Py_Initialize();

+ 

+ #if PY_MAJOR_VERSION < 3

@@ -13,7 +13,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        5.9.0

-Release:        5%{?kat_build:.kat}%{?dist}

+Release:        6%{?kat_build:.kat}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -53,6 +53,8 @@ Patch4:	        9p-trans_fd-extend-port-variable-to-u32.patch

 Patch5:         vsock-delay-detach-of-QP-with-outgoing-data-59.patch

 # RDRAND-based RNG driver to enhance the kernel's entropy pool:

 Patch6:         hwrng-rdrand-Add-RNG-driver-based-on-x86-rdrand-inst.patch

+# Fix perf python script with python 3.9

+Patch7:         fix-perf-script-with-python3.9.patch

 # ttyXRUSB support

 Patch10:	usb-acm-exclude-exar-usb-serial-ports-nxt.patch

@@ -288,6 +290,7 @@ Python programming language to use the interface to manipulate perf events.

 %patch4 -p1

 %patch5 -p1

 %patch6 -p1

+%patch7 -p1

 %patch10 -p1

 %patch11 -p1

@@ -684,6 +687,8 @@ getent group sgx_prv >/dev/null || groupadd -r sgx_prv

 %{python3_sitelib}/*

 %changelog

+*   Wed Nov 11 2020 Tapas Kundu <tkundu@vmware.com> 5.9.0-6

+-   Fix perf python script for compatibility with python 3.9

 *   Tue Nov 10 2020 Keerthana K <keerthanak@vmware.com> 5.9.0-5

 -   Fix CVE-2020-8694

 *   Fri Nov 06 2020 Keerthana K <keerthanak@vmware.com> 5.9.0-4

new file mode 100644

@@ -0,0 +1,19 @@

+--- a/configure	2020-10-13 11:52:36.322606543 +0530

+@@ -5,6 +5,7 @@

+ # as is the fact that the ] goes on a new line.

+ _=[ 'exec' '/bin/sh' '-c' '''

+ test ${FORCE_PYTHON2} && exec python2 "$0" "$@"  # workaround for gclient

++command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"

+ command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"

+ command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"

+ command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"

+@@ -19,7 +20,7 @@ import sys

+ from distutils.spawn import find_executable

+ 

+ print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))

+-acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7))

++acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))

+ if sys.version_info[:2] in acceptable_pythons:

+   import configure

+ else:

@@ -1,15 +1,15 @@

 Summary:        A JavaScript runtime built on Chrome's V8 JavaScript engine.

 Name:           nodejs

-Version:        14.5.0

+Version:        14.13.1

 Release:        1%{?dist}

 License:        MIT

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 URL:            https://github.com/nodejs/node

-Source0:        https://nodejs.org/download/release/v%{version}/node-v%{version}.tar.xz

-%define         sha1 node=7a0a77084f5e0475d386be3f8f494d7bce429014

-

+Source0:        https://nodejs.org/download/release/v%{version}/node-v%{version}.tar.gz

+%define         sha1 node=5d3a61a5136e341844ef44b648bab36bde7a6c24

+Patch0:         fix_build_with_python3.9.patch

 BuildRequires:  coreutils >= 8.22, zlib

 BuildRequires:  python3

 BuildRequires:  which

@@ -30,6 +30,7 @@ for developing applications that use nodejs.

 %prep

 %setup -q -n node-v%{version}

+%patch0 -p1

 %build

 sh configure --prefix=%{_prefix}

@@ -69,6 +70,8 @@ make cctest

 %{_datadir}/systemtap/tapset/node.stp

 %changelog

+*   Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 14.13.1-1

+-   Update to 14.13.1 to build with python3.9

 *   Mon Jul 06 2020 Tapas Kundu <tkundu@vmware.com> 14.5.0-1

 -   Update nodejs

 *   Tue Jun 23 2020 Tapas Kundu <tkundu@vmware.com> 10.15.2-2

@@ -3,7 +3,7 @@

 Summary:        A shared library implementation of IPMI and the basic tools

 Name:           openipmi

 Version:        2.0.29

-Release:        3%{?dist}

+Release:        4%{?dist}

 URL:            https://sourceforge.net/projects/openipmi/

 License:        LGPLv2+ and GPLv2+ or BSD

 Group:          System Environment/Base

@@ -84,7 +84,7 @@ This package contains a network IPMI listener.

     --docdir=%{_docdir}/%{name}-%{version}  \

     --with-perl=yes                         \

     --with-perlinstall=%{perl_vendorarch}   \

-    --with-python=/usr/bin/python3.8        \

+    --with-python=/usr/bin/python3.9        \

     --with-pythoninstall=%{python3_sitelib}

 make

@@ -183,6 +183,8 @@ echo "disable ipmi.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-ip

 %{_mandir}/man5/ipmi_sim_cmd.5.gz

 %changelog

+*   Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 2.0.29-4

+-   Use python 3.9

 *   Tue Sep 29 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 2.0.29-3

 -   openssl 1.1.1

 *   Mon Jul 27 2020 Tapas Kundu <tkundu@vmware.com> 2.0.29-2

@@ -1,7 +1,7 @@

 Summary:        Open Source Security Compliance Solution

 Name:           openscap

 Version:        1.3.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPL2+

 URL:            https://www.open-scap.org

 Source0:        https://github.com/OpenSCAP/openscap/releases/download/%{version}/openscap-%{version}.tar.gz

@@ -99,9 +99,11 @@ find %{buildroot} -name '*.la' -delete

 %files python3

 %defattr(-,root,root)

-%{_libdir}/python3.8/*

+%{_libdir}/python3.9/*

 %changelog

+*   Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 1.3.4-2

+-   Build with python3

 *   Thu Oct 01 2020 Gerrit Photon <photon-checkins@vmware.com> 1.3.4-1

 -   Automatic Version Bump

 *   Mon Jul 27 2020 Vikash Bansal <bvikas@vmware.com> 1.3.3-1

@@ -3,7 +3,7 @@

 Summary:        Lightweight in-process concurrent programming

 Name:           python3-greenlet

 Version:        0.4.17

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        MIT

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

@@ -42,9 +42,11 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %files

 %defattr(-,root,root,-)

 %{python3_sitelib}/*

-/usr/include/python3.8/greenlet/greenlet.h

+/usr/include/python3.9/greenlet/greenlet.h

 %changelog

+*   Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 0.4.17-2

+-   Use python3.9

 *   Tue Sep 22 2020 Gerrit Photon <photon-checkins@vmware.com> 0.4.17-1

 -   Automatic Version Bump

 *   Sun Jul 26 2020 Tapas Kundu <tkundu@vmware.com> 0.4.16-2

@@ -3,7 +3,7 @@

 Summary:        Array processing for numbers, strings, records, and objects

 Name:           python3-numpy

 Version:        1.19.2

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        BSD

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

@@ -53,10 +53,12 @@ rm -rf test

 %defattr(-,root,root,-)

 %{_bindir}/f2py3

 %{_bindir}/f2py

-%{_bindir}/f2py3.8

+%{_bindir}/f2py3.9

 %{python3_sitelib}/*

 %changelog

+*   Tue Oct 13 2020 Tapas Kundu <tkundu@vmware.com> 1.19.2-3

+-   Build with python 3.9

 *   Tue Sep 29 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.19.2-2

 -   openssl 1.1.1

 *   Thu Sep 10 2020 Gerrit Photon <photon-checkins@vmware.com> 1.19.2-1

@@ -1,6 +1,6 @@

 Summary:        A high-level scripting language

 Name:           python3

-Version:        3.8.6

+Version:        3.9.0

 Release:        1%{?dist}

 License:        PSF

 URL:            http://www.python.org/

@@ -8,7 +8,7 @@ Group:          System Environment/Programming

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz

-%define sha1    Python=6ee446eaacf901a3305565bd6569e2de135168e3

+%define sha1    Python=ff1fc8c37d5d4b09ec3bf0d84f3e5b97745c6704

 Source1:        macros.python

 Patch0:         cgi3.patch

 BuildRequires:  pkg-config >= 0.28

@@ -214,57 +214,56 @@ rm -rf %{buildroot}/*

 %doc LICENSE README.rst

 %{_bindir}/pydoc*

 %{_bindir}/python3

-%{_bindir}/python3.8

+%{_bindir}/python3.9

 %{_mandir}/*/*

-%dir %{_libdir}/python3.8

-%{_libdir}/python3.8/site-packages/README.txt

+%dir %{_libdir}/python3.9

+%{_libdir}/python3.9/site-packages/README.txt

 %{_libdir}/libpython3.so

-%{_libdir}/libpython3.8.so.1.0

+%{_libdir}/libpython3.9.so.1.0

-%exclude %{_libdir}/python3.8/ctypes/test

-%exclude %{_libdir}/python3.8/distutils/tests

-%exclude %{_libdir}/python3.8/sqlite3/test

-%exclude %{_libdir}/python3.8/idlelib/idle_test

-%exclude %{_libdir}/python3.8/test

-%exclude %{_libdir}/python3.8/lib-dynload/_ctypes_test.*.so

+%exclude %{_libdir}/python3.9/ctypes/test

+%exclude %{_libdir}/python3.9/distutils/tests

+%exclude %{_libdir}/python3.9/sqlite3/test

+%exclude %{_libdir}/python3.9/idlelib/idle_test

+%exclude %{_libdir}/python3.9/test

+%exclude %{_libdir}/python3.9/lib-dynload/_ctypes_test.*.so

 %files libs

 %defattr(-,root,root)

 %doc LICENSE README.rst

-%{_libdir}/python3.8

-%exclude %{_libdir}/python3.8/lib2to3

-%exclude %{_libdir}/python3.8/site-packages/

-%exclude %{_libdir}/python3.8/ctypes/test

-%exclude %{_libdir}/python3.8/distutils/tests

-%exclude %{_libdir}/python3.8/sqlite3/test

-%exclude %{_libdir}/python3.8/idlelib/idle_test

-%exclude %{_libdir}/python3.8/test

-%exclude %{_libdir}/python3.8/lib-dynload/_ctypes_test.*.so

-%exclude %{_libdir}/python3.8/xml

-%exclude %{_libdir}/python3.8/lib-dynload/pyexpat*.so

-%exclude %{_libdir}/python3.8/curses

-%exclude %{_libdir}/python3.8/lib-dynload/_curses*.so

-%exclude %{_libdir}/python3.8/distutils/command/wininst-*.exe

+%{_libdir}/python3.9

+%exclude %{_libdir}/python3.9/lib2to3

+%exclude %{_libdir}/python3.9/site-packages/

+%exclude %{_libdir}/python3.9/ctypes/test

+%exclude %{_libdir}/python3.9/distutils/tests

+%exclude %{_libdir}/python3.9/sqlite3/test

+%exclude %{_libdir}/python3.9/idlelib/idle_test

+%exclude %{_libdir}/python3.9/test

+%exclude %{_libdir}/python3.9/lib-dynload/_ctypes_test.*.so

+%exclude %{_libdir}/python3.9/xml

+%exclude %{_libdir}/python3.9/lib-dynload/pyexpat*.so

+%exclude %{_libdir}/python3.9/curses

+%exclude %{_libdir}/python3.9/lib-dynload/_curses*.so

 %files  xml

-%{_libdir}/python3.8/xml/*

-%{_libdir}/python3.8/lib-dynload/pyexpat*.so

+%{_libdir}/python3.9/xml/*

+%{_libdir}/python3.9/lib-dynload/pyexpat*.so

 %files  curses

-%{_libdir}/python3.8/curses/*

-%{_libdir}/python3.8/lib-dynload/_curses*.so

+%{_libdir}/python3.9/curses/*

+%{_libdir}/python3.9/lib-dynload/_curses*.so

 %files devel

 %defattr(-,root,root)

 %{_includedir}/*

-%{_libdir}/libpython3.8.so

-%{_libdir}/pkgconfig/python-3.8.pc

+%{_libdir}/libpython3.9.so

+%{_libdir}/pkgconfig/python-3.9.pc

 %{_libdir}/pkgconfig/python3.pc

 %{_bindir}/python3-config

-%{_bindir}/python3.8-config

-%{_libdir}/pkgconfig/python-3.8-embed.pc

+%{_bindir}/python3.9-config

+%{_libdir}/pkgconfig/python-3.9-embed.pc

 %{_libdir}/pkgconfig/python3-embed.pc

 %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit

@@ -274,30 +273,31 @@ rm -rf %{buildroot}/*

 %files tools

 %defattr(-,root,root,755)

 %doc Tools/README

-%{_libdir}/python3.8/lib2to3

-%{_bindir}/2to3-3.8

+%{_libdir}/python3.9/lib2to3

+%{_bindir}/2to3-3.9

 %exclude %{_bindir}/idle*

 %files pip

 %defattr(-,root,root,755)

-%{_libdir}/python3.8/site-packages/pip/*

-%{_libdir}/python3.8/site-packages/pip-20.2.1.dist-info/*

+%{_libdir}/python3.9/site-packages/pip/*

 %{_bindir}/pip*

 %files setuptools

 %defattr(-,root,root,755)

-%{_libdir}/python3.8/site-packages/pkg_resources/*

-%{_libdir}/python3.8/site-packages/setuptools/*

-%{_libdir}/python3.8/site-packages/setuptools-49.2.1.dist-info/*

-%{_bindir}/easy_install-3.8

+%{_libdir}/python3.9/site-packages/pkg_resources/*

+%{_libdir}/python3.9/site-packages/setuptools/*

+%{_libdir}/python3.9/site-packages/setuptools-49.2.1.dist-info/*

+%{_bindir}/easy_install-3.9

 %files test

-%{_libdir}/python3.8/test/*

+%{_libdir}/python3.9/test/*

 %files macros

 %{_libdir}/rpm/macros.d/macros.python

 %changelog

+*   Tue Oct 13 2020 Taoas Kundu <tkundu@vmware.com> 3.9.0-1

+-   Update to 3.9.0

 *   Wed Sep 30 2020 Gerrit Photon <photon-checkins@vmware.com> 3.8.6-1

 -   Automatic Version Bump

 *   Tue Sep 29 2020 Satya Naga Vasamsetty <svasamsetty@vmware.com> 3.8.5-4

new file mode 100644

@@ -0,0 +1,11 @@

+--- a/setup.py	2020-11-06 18:00:20.559994152 +0530

+@@ -106,7 +106,7 @@ ext_py_mods = [Extension('setools.policy

+                          libraries=['selinux', 'sepol'],

+                          library_dirs=lib_dirs,

+                          define_macros=macros,

+-                         extra_compile_args=['-Werror', '-Wextra',

++                         extra_compile_args=['-Wextra',

+                                              '-Waggregate-return',

+                                              '-Wfloat-equal',

+                                              '-Wformat', '-Wformat=2',

@@ -3,11 +3,12 @@

 Summary:        Policy analysis tools for SELinux

 Name:           setools

 Version:        4.3.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2, LGPLv2.1

 Group:          System Environment/Libraries

 Source0:        https://github.com/SELinuxProject/setools/releases/download/%{version}/%{name}-%{version}.tar.bz2

 %define sha1    setools=75ffc1724707b8bc4eb90b118cd29161c43fe568

+Patch0:         fix-build-with-python3.9.patch

 Url:            https://github.com/SELinuxProject/selinux/wiki

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -27,6 +28,7 @@ Policy analysis tools for SELinux

 %prep

 %setup -qn %{name}

+%patch0 -p1

 sed -i "s/, 'networkx>=2.0'//" setup.py

 %build

@@ -34,7 +36,7 @@ python3 setup.py build_ext

 python3 setup.py build

 %install

-python3 setup.py install --root %{buildroot}

+python3 setup.py install --root %{buildroot} --skip-build

 # do not package ru man pages

 rm -rf %{buildroot}%{_mandir}/ru

@@ -50,5 +52,7 @@ rm -rf %{buildroot}%{_mandir}/ru

 %{_mandir}/man1/*

 %changelog

+* Fri Nov 06 2020 Tapas Kundu <tkundu@vmware.com> 4.3.0-2

+- Build with python 3.9

 * Fri May 01 2020 Alexey Makhalov <amakhalov@vmware.com> 4.3.0-1

 - Initial build.