From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- media-gfx/freecad/files/99freecad | 1 - ...-0004809-Security-vulnerability-in-DWG-im.patch | 59 ++++++++++++++++++++++ ...-Use-run-instead-of-Popen-to-avoid-need-f.patch | 25 +++++++++ ...ad-0.19.4-Gentoo-specific-don-t-check-vcs.patch | 20 ++++++++ 4 files changed, 104 insertions(+), 1 deletion(-) delete mode 100644 media-gfx/freecad/files/99freecad create mode 100644 media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch create mode 100644 media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch create mode 100644 media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch (limited to 'media-gfx/freecad/files') diff --git a/media-gfx/freecad/files/99freecad b/media-gfx/freecad/files/99freecad deleted file mode 100644 index 81104107c22e..000000000000 --- a/media-gfx/freecad/files/99freecad +++ /dev/null @@ -1 +0,0 @@ -PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64 diff --git a/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch new file mode 100644 index 000000000000..2df44ff66ac8 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19.2-0001-Backport-of-0004809-Security-vulnerability-in-DWG-im.patch @@ -0,0 +1,59 @@ +From 4006e62860c73f0943e71c7da478256a7337941d Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Mon, 31 Jan 2022 08:12:35 +0100 +Subject: [PATCH 1/2] Backport of 0004809: Security vulnerability in DWG import + when using ODA file converter + +Original patch commit id 1742d7ff82af1653253c4a4183c262c9af3b26d6 by +wmayer . + +Signed-off-by: Bernd Waibel +--- a/src/Mod/Draft/importDWG.py ++++ b/src/Mod/Draft/importDWG.py +@@ -44,8 +44,6 @@ https://knowledge.autodesk.com/support/autocad/downloads/ + # * * + # *************************************************************************** + +-# TODO: use subprocess.popen() instead of subprocess.call() +- + import six + import FreeCAD + from FreeCAD import Console as FCC +@@ -217,15 +215,10 @@ def convertToDxf(dwgfilename): + indir = os.path.dirname(dwgfilename) + outdir = tempfile.mkdtemp() + basename = os.path.basename(dwgfilename) +- cmdline = ('"%s" "%s" "%s" "ACAD2000" "DXF" "0" "1" "%s"' +- % (teigha, indir, outdir, basename)) +- FCC.PrintMessage(translate("ImportDWG", "Converting: ") +- + cmdline + "\n") +- if six.PY2: +- if isinstance(cmdline, six.text_type): +- encoding = sys.getfilesystemencoding() +- cmdline = cmdline.encode(encoding) +- subprocess.call(cmdline, shell=True) # os.system(cmdline) ++ cmdline = [teigha, indir, outdir, "ACAD2000", "DXF", "0", "1", basename] ++ FCC.PrintMessage(translate("draft", "Converting:") + " " + str(cmdline) + "\n") ++ proc = subprocess.Popen(cmdline) ++ proc.communicate() + result = outdir + os.sep + os.path.splitext(basename)[0] + ".dxf" + if os.path.exists(result): + FCC.PrintMessage(translate("ImportDWG", +@@ -270,10 +263,9 @@ def convertToDwg(dxffilename, dwgfilename): + indir = os.path.dirname(dxffilename) + outdir = os.path.dirname(dwgfilename) + basename = os.path.basename(dxffilename) +- cmdline = ('"%s" "%s" "%s" "ACAD2000" "DWG" "0" "1" "%s"' +- % (teigha, indir, outdir, basename)) +- FCC.PrintMessage(translate("ImportDWG", "Converting: ") +- + cmdline + "\n") +- subprocess.call(cmdline, shell=True) # os.system(cmdline) ++ cmdline = [teigha, indir, outdir, "ACAD2000", "DWG", "0", "1", basename] ++ FCC.PrintMessage(translate("draft", "Converting:") + " " + str(cmdline) + "\n") ++ proc = subprocess.Popen(cmdline) ++ proc.communicate() + return dwgfilename + return None +-- +2.35.0 + diff --git a/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch b/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch new file mode 100644 index 000000000000..9b043bd34563 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19.2-0002-Backport-of-Use-run-instead-of-Popen-to-avoid-need-f.patch @@ -0,0 +1,25 @@ +From 937d8ca9bf4c50f8a7dc0fbcf9e6ac23b0fbe033 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Mon, 31 Jan 2022 08:17:24 +0100 +Subject: [PATCH 2/2] Backport of Use run() instead of Popen() to avoid need + for communicate + +Original patch commit id a65dbc6f8296562a12407a36f4931a80bbb628b7 by +sliptonic + +Signed-off-by: Bernd Waibel +--- a/src/Mod/Path/PathScripts/PathSanity.py ++++ b/src/Mod/Path/PathScripts/PathSanity.py +@@ -412,8 +412,7 @@ class CommandPathSanity: + FreeCAD.Console.PrintMessage('asciidoc file written to {}\n'.format(reportraw)) + + try: +- result = os.system('asciidoctor {} -o {}'.format(reportraw, +- reporthtml)) ++ result = subprocess.run(["asciidoctor", reportraw, "-o", reporthtml]) + if str(result) == "32512": + msg = "asciidoctor not found. html cannot be generated." + QtGui.QMessageBox.information(None, "Path Sanity", msg) +-- +2.35.0 + diff --git a/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch new file mode 100644 index 000000000000..62ae92392adf --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19.4-Gentoo-specific-don-t-check-vcs.patch @@ -0,0 +1,20 @@ +From 60ba533d21302b8a4c11ac06adb53b4041754b02 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Tue, 1 Mar 2022 18:22:00 +0100 +Subject: [PATCH] [Gentoo specific] don't check vcs + +Signed-off-by: Bernd Waibel +--- a/src/Tools/SubWCRev.py ++++ b/src/Tools/SubWCRev.py +@@ -455,7 +455,7 @@ def main(): + if o in ("-b", "--bindir"): + bindir = a + +- vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()] ++ vcs=[UnknownControl()] + for i in vcs: + if i.extractInfo(srcdir, bindir): + # Open the template file and the version file +-- +2.35.1 + -- cgit v1.2.3