From ea5aae01e8850de61a16187ce248b056cf2f9f2d Mon Sep 17 00:00:00 2001 From: wu-leilei Date: Tue, 30 May 2023 17:47:30 +0800 Subject: [PATCH] Fix python compatibility (cherry picked from commit a8a1392ecabc0d813b10731862efccc6d5c39c07) --- b43-tools.spec | 15 +++++++++++++-- fix-function-file-to-open.patch | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 fix-function-file-to-open.patch diff --git a/b43-tools.spec b/b43-tools.spec index 84857eb..cd0c499 100644 --- a/b43-tools.spec +++ b/b43-tools.spec @@ -1,6 +1,6 @@ Name: b43-tools Version: 019 -Release: 6 +Release: 7 Summary: Tools for the Broadcom 43xx series WLAN chip License: GPLv2 and GPLv2+ and GPLv3 and BSD-2-Clause and Public Domain URL: https://bues.ch/cgit/b43-tools.git @@ -8,6 +8,7 @@ Source0: https://bues.ch/cgit/b43-tools.git/snapshot/b43-tools-b43-fwcutt BuildRequires: bison flex flex-static python3-devel gcc Patch0001: 0001-b43-tools-fix-format-security-errors.patch Patch0002: 0002-Explicitly-use-python3.patch +Patch0003: fix-function-file-to-open.patch %description Tools for the Broadcom 43xx series WLAN chip. @@ -21,10 +22,17 @@ install -p -m 0644 debug/README README.debug install -p -m 0644 disassembler/COPYING COPYING.disassembler install -p -m 0644 ssb_sprom/README README.ssb_sprom install -p -m 0644 ssb_sprom/COPYING COPYING.ssb_sprom -install -p -m 0644 debug/install.py debug/setup.py +sed 's/py_modules=/version="%{version}", py_modules=/' debug/install.py > debug/setup.py 2to3 -w . +2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/disassembler/brcm80211-fwconv +2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/disassembler/b43-ivaldump +2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/disassembler/brcm80211-ivaldump +2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/debug/b43-beautifier +2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/debug/b43-fwdump +2to3 -w %{_builddir}/b43-tools-b43-fwcutter-019/debug/patcher-template + %build CFLAGS="%{optflags}" %make_build -C assembler CFLAGS="%{optflags}" %make_build -C disassembler @@ -50,6 +58,9 @@ cd debug %{python3_sitelib}/* %changelog +* Tue May 30 2023 wulei - 019-7 +- Fix python compatibility + * Mon May 31 2021 baizhonggui - 019-6 - Add gcc in BuildRequires diff --git a/fix-function-file-to-open.patch b/fix-function-file-to-open.patch new file mode 100644 index 0000000..6624cec --- /dev/null +++ b/fix-function-file-to-open.patch @@ -0,0 +1,24 @@ +diff -Nur a/disassembler/b43-ivaldump b/disassembler/b43-ivaldump +--- a/disassembler/b43-ivaldump 2023-05-30 16:33:01.128951580 +0800 ++++ b/disassembler/b43-ivaldump 2023-05-30 16:33:38.732951580 +0800 +@@ -36,7 +36,7 @@ + filename = sys.argv[1] + + try: +- ivals = file(filename).read() ++ ivals = open(filename).read() + except IOError, e: + print "Could not read the initvals file: %s" % e.strerror + sys.exit(1) +diff -Nur a/disassembler/brcm80211-ivaldump b/disassembler/brcm80211-ivaldump +--- a/disassembler/brcm80211-ivaldump 2023-05-30 16:33:01.128951580 +0800 ++++ b/disassembler/brcm80211-ivaldump 2023-05-30 16:34:17.524951580 +0800 +@@ -36,7 +36,7 @@ + filename = sys.argv[1] + + try: +- ivals = file(filename).read() ++ ivals = open(filename).read() + except IOError, e: + print "Could not read the initvals file: %s" % e.strerror + sys.exit(1)