Skip to content

Commit c584353

Browse files
committed
linuxcnc: init at 2.9.8
This adds the LinuxCNC package. The package is quite messy, as LinuxCNC contains a mixture of GTK, TCL, QT, Python, C and C++ programs and GUI components. Most notably, this package has to use an opt-in impure mechanism for setuid wrappers (using symlinks pointing out of the store into `/run/wrappers/bin`) as LinuxCNC itself checks if the executables in LINUXCNC_HOME are setuid wrapped. Notably, as LINUXCNC_HOME is also used to find assets, we can not just overwrite the environment variable for the setuid wrapper. But the check also does not verify $0 to have setuid, but rather `$LINUXCNC_HOME/bin/rtapi_app`. There is an environment variable supposed to override these checks (`LINUXCNC_FORCE_REALTIME`), but it doesn't work (upstream issue: LinuxCNC/linuxcnc#3928) Also, the _modern_ LinuxCNC GUI (QtDragon) uses an olt qtwebkit severed by CVEs. As a compromise, this is an opt-in feature. Use needs to decide for themselves whether they are willing to take the risk of the associated CVEs. Signed-off-by: wucke13 <wucke13+github@gmail.com>
1 parent 1408e47 commit c584353

2 files changed

Lines changed: 438 additions & 0 deletions

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/tcl/bin/genedit.tcl b/tcl/bin/genedit.tcl
2+
index 03eed07eb0..1dd7d26544 100755
3+
--- a/tcl/bin/genedit.tcl
4+
+++ b/tcl/bin/genedit.tcl
5+
@@ -150,7 +150,7 @@ proc geneditStart {name {ifilename "untitled.txt"} {itypes { {"All files" *} {"T
6+
$menubar add cascade -label [msgcat::mc "Scripts"] -menu $scriptmenu -underline 1
7+
#replaced scriptdir
8+
#set scriptdir tcl/scripts
9+
- set files [exec /bin/ls $linuxcnc::TCL_SCRIPT_DIR]
10+
+ set files [exec ls $linuxcnc::TCL_SCRIPT_DIR]
11+
foreach file $files {
12+
if {[string match *.ncw $file]} {
13+
set geneditfname [file rootname $file]
14+
diff --git a/tcl/tklinuxcnc.tcl b/tcl/tklinuxcnc.tcl
15+
index d35db33840..9030ca219e 100755
16+
--- a/tcl/tklinuxcnc.tcl
17+
+++ b/tcl/tklinuxcnc.tcl
18+
@@ -797,7 +797,7 @@ set scriptsmenu [menu $menubar.scripts -tearoff 1]
19+
$menubar add cascade -label [msgcat::mc "Scripts"] -menu $scriptsmenu -underline 1
20+
21+
if { $windows == 0 } {
22+
- set files [exec /bin/ls $linuxcnc::TCL_SCRIPT_DIR]
23+
+ set files [exec ls $linuxcnc::TCL_SCRIPT_DIR]
24+
foreach file $files {
25+
if {[string match *.tcl $file]} {
26+
set fname [file rootname $file]

0 commit comments

Comments
 (0)