Skip to content

Commit 71d48c3

Browse files
authored
debian: reduce Lintian Warnings. (hardening-no-relro: panelui, module_helper)
* Redoing PR#3381 - reducing Lintian Warnings. * debian: lintian indicates hardening-no-relro: panelui, module_helper * debian: lintian complained about typos in d/changelog * debian: Simplified and extended lintian overrides.
1 parent 2f77f0b commit 71d48c3

File tree

7 files changed

+86
-77
lines changed

7 files changed

+86
-77
lines changed

debian/changelog

Lines changed: 69 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,17 @@ linuxcnc (1:2.9.4) UNRELEASED; urgency=medium
4444
* Update m-code.adoc - typo exection -> execution
4545
* Merge pull request #3247 from Sigma1912/patch-1
4646
* gmoccapy.adoc: correct INI section name [MACROS]
47-
* Disable "override limits" at the end of the jog. This fixes the issue that the override was not cleared in teleop (homed) mode Issue #2482
47+
* Disable "override limits" at the end of the jog.
48+
This fixes the issue that the override was not cleared
49+
in teleop (homed) mode Issue #2482
4850
* Doc: User Defined Command, add note on exit codes != 0
4951
* gmoccapy: update release notes
5052
* docs: fix list in building-linuxcnc.adoc
5153
* Typos in carousel.comp
5254
* Merge pull request #3227 from BsAtHome/backport_2.9_3200-3202
5355
* Merge pull request #3226 from BsAtHome/backport_2.9_fix-hm2_spi
54-
* Backport fix hm2_spi driver. This was discovered in master and fixed in PR #3225.
56+
* Backport fix hm2_spi driver.
57+
This was discovered in master and fixed in PR #3225.
5558
* Backport fix superfluous NULL check to 2.9 branch (issue #3202).
5659
* Backport fix invalid printf format to 2.9 branch (issue #3200).
5760
* Merge pull request #3212 from BsAtHome/hm2_spix-backport-2.9
@@ -73,7 +76,7 @@ linuxcnc (1:2.9.4) UNRELEASED; urgency=medium
7376
* Change to raw strings to fix Python SyntaxWarning
7477
* docs: improve "HAL Component Generator" doc page (halcompile)
7578
* Merge pull request #3158 from petterreinholdtsen/bug-debian-1080668-python3-setuptools
76-
* Dropped use of depricated python3-setuptools / distutils.
79+
* Dropped use of deprecated python3-setuptools / distutils.
7780
* Merge pull request #3159 from petterreinholdtsen/2.9-upstream-ax-python
7881
* Fetched latest ax_python.m4 and ax_python_devel.m4 from upstream.
7982
* Revert "Remove remaining use of deprecated distutils."
@@ -87,7 +90,8 @@ linuxcnc (1:2.9.4) UNRELEASED; urgency=medium
8790
* Merge pull request #3048 from hansu/gmoccapy-gcmc-config
8891
* qtvcp -action_buttons: fix momentary buttons status indicator
8992
* Merge pull request #3130 from hansu/gmoccapy-deprecation-warning-2
90-
* gmoccapy: fix deprecation warning "Gtk.StyleContext.get_background_color is deprecated"
93+
* gmoccapy: fix deprecation warning
94+
"Gtk.StyleContext.get_background_color is deprecated"
9195
* Merge pull request #3115 from zz912/patch-30
9296
* Merge pull request #3125 from hansu/gmoccapy-deprecation-warning
9397
* gscreen: remove deprecated use of GtkLabel constructor
@@ -96,15 +100,16 @@ linuxcnc (1:2.9.4) UNRELEASED; urgency=medium
96100
* lathe_macros.ini - enable postgui.hal
97101
* Replace non-exist toolchange.py by stdglue.py
98102
* Merge pull request #3106 from LinuxCNC/andypugh/gscreen
99-
* gscreen: Fix Spartan sim homing
100-
* gscreen: Further tidying up to clear up runtime errors and startup verbosity
101-
* gscreen: Fix broken configs - Silverdragon++ I found how to do settings when fixing gaxis
102-
* gscreen: Fix broken configs - tester
103-
* gscreen: Fix broken configs - gaxis
104-
* gscreen: Fix broken configs - 9-axis
105-
* gscreen: Fix broken configs - Spartan
106-
* gscreen: Fix broken configs - Industrial
103+
* gscreen:
104+
- Fix Spartan sim homing
105+
- Further tidying up to clear up runtime errors and startup verbosity
107106
* gscreen: Fix broken configs
107+
- Silverdragon++ I found how to do settings when fixing gaxis
108+
- tester
109+
- gaxis
110+
- 9-axis
111+
- Spartan
112+
- Industrial
108113
* docs: add note to gmoccapy keyboard shortcuts
109114
* fix: eliminated printf in shell script
110115
* Merge pull request #3090 from Sigma1912/2.9-fix-configs-apps-gladevcp
@@ -116,22 +121,27 @@ linuxcnc (1:2.9.4) UNRELEASED; urgency=medium
116121
* Update configs/apps/gladevcp/animated-backdrop/cairodraw.py
117122
* Merge pull request #3083 from hansu/gtk-sourceview-4-migration
118123
* configs/apps/gladevcp/animated-backdrop: partial fix
119-
* configs/apps/gladevcp/by-widget/sourceview: fix 'up','down' button functionalitiy
120-
* fix configs/apps/gladevcp: update to gtk3 ('sourceview' and 'animated backdrop' still not 100%))
124+
* configs/apps/gladevcp/by-widget/sourceview:
125+
fix 'up','down' button functionalitiy
126+
* fix configs/apps/gladevcp: update to gtk3
127+
('sourceview' and 'animated backdrop' still not 100%))
121128
* Use now GtkSourceview 4
122129
* qtplasmac: fix file load after single cut
123130
* Merge pull request #3076 from Sigma1912/2.9-fix-sim-config-rack-toolchange
124-
* Fix glade panel and remove depricated 'Features' entries in ini
131+
* Fix glade panel and remove deprecated 'Features' entries in ini
125132
* qtvcp -tab_widget: fix float/int error with new libraries
126133
* Merge pull request #3054 from petterreinholdtsen/2.9-build-sid
127134
* Reinsert github CI test build on sid
128135
* Merge pull request #3026 from hansu/2966-gmoccapy-destroys-tooltable
129136
* Merge pull request #3049 from mark-v-d/2.9
130-
* We need to turn cutter compensation off for the rapid to the startpoint as well.
137+
* We need to turn cutter compensation off
138+
for the rapid to the startpoint as well.
131139
* Merge pull request #3017 from petterreinholdtsen/2-9-smoe-debian_manpages
132140
* gmoccapy: add sim config for gcmc support
133-
* tooledit: throw exeption when locale not set
134-
* tooltable: create a backup file when error occurs on saving + add exception message
141+
* tooledit: throw exception when locale not set
142+
* tooltable:
143+
- create a backup file when error occurs on saving
144+
- add exception message
135145
* Adjusted handling of man pages to avoid duplicate lists.
136146
* Merge pull request #3043 from petterreinholdtsen/2.9-disable-unstable-build
137147
* Disabled github CI build on unstable/sid until it start working again.
@@ -147,8 +157,11 @@ linuxcnc (1:2.9.4) UNRELEASED; urgency=medium
147157
* docs: force monospace font in ASCII art (related to #3007)
148158
* docs: fix missing line break in toggle2nist man page
149159
* Merge pull request #3020 from mark-v-d/2.9
150-
* Fixed bug #2939. But now new and improved. This fixes the case where the sub actually has a leadout, but it is too short.
151-
* Fixed bug #2939. When fixing the case where there was no leadout move, I broke the case where the leadout was exceeding the starting point.
160+
* Fixed bug #2939. But now new and improved.
161+
This fixes the case where the sub actually has a leadout,
162+
but it is too short.
163+
* Fixed bug #2939. When fixing the case where there was no leadout move,
164+
I broke the case where the leadout was exceeding the starting point.
152165
* Allow uniq_id to be used to select hal_input devices. (#3015)
153166

154167
-- andypugh <andy@bodgesoc.org> Sat, 25 Jan 2025 12:20:01 +0000
@@ -247,15 +260,16 @@ linuxcnc (1:2.9.3) UNRELEASED; urgency=medium
247260
* qtvcp -stylesheet editor: add the config's preferred search path
248261
* qtplasmac: add translation for tool type
249262
* qtplasmac: fix gcode filter spotting coordinates when overburn is active
250-
* qtplasmac: allow Z DRO to display torch height in manual cut
263+
* qtplasmac: allow Z DRO to display torch height in manual cut
251264
* qtplasmac: run from line fixes
252265
* qtplasmac: fix state when cut recovery offsets are reset
253266
* plasmac: fix manual cut abort state
254267
* docs: fix qtplasmac estop type info
255268
* docs - qtplasmac: fix locale creation
256269
* Merge pull request #2901 from jethornton/2.9
257270
* Update python-interface.adoc
258-
* Note that the axes stat has been removed and show a way to get the same information from axis_mask
271+
* Note that the axes stat has been removed and
272+
show a way to get the same information from axis_mask
259273
* Removing While Loop, Correcting Typo
260274
* Execute 'aclocal' when generating configuration files
261275
* qtplasmac: fix missing g64 value in run from line
@@ -319,7 +333,8 @@ linuxcnc (1:2.9.3) UNRELEASED; urgency=medium
319333
* docs: Eliminated some terminal blanks in docs.
320334
* Typo found in documentation.
321335
* qtvcp -docs: add writeup on preferred way to add custom code to screens.
322-
* gmoccapy: remember window size and position when switching back from fullscreen/maximized
336+
* gmoccapy: remember window size and position
337+
when switching back from fullscreen/maximized
323338
* gmoccapy: fix "window does not fit 1024x768 in fullscreen"
324339
* Update deprecated Pillow constant
325340
* docs: 2.9.2 to 2.9.y
@@ -387,14 +402,16 @@ linuxcnc (1:2.9.2) unstable; urgency=medium
387402
* Add dither option to PWMGen for improved analog resolution
388403
* axis: Fix run-from-line - bug #2771
389404
* debian/changelog: fix epoch & white space
390-
* deleted craftsman gui, as it is not python 2 nor gtk3 based and not mantained for a long period
405+
* deleted craftsman gui, as it is not python 2 nor gtk3 based
406+
and not mantained for a long period
391407
* deleted gmoccapy plasma, as glade panels are still in gtk2
392408
* Docs: Many updates
393409
* fix hardcoded description in Spanish language Closes: #1057312
394410
* Fixes warnings for possible string truncation with strncpy()
395411
* Gladevcp: fix error on missing filter program
396-
* gmoccapy: Fixed Inappropriate Logical Expression (#2769)
397-
* gmoccapy: fixes error when trying to hide the turtle-jog button in gmoccapy
412+
* gmoccapy:
413+
- Fixed Inappropriate Logical Expression (#2769)
414+
- Fixed error when trying to hide the turtle-jog button in gmoccapy
398415
* hal_glib -add get_linuxcnc_version function
399416
* Increase size of STACK_ENTRY_LEN
400417
* Merge pull request #2567 from petterreinholdtsen/2.9-gcode-g38.2
@@ -412,8 +429,9 @@ linuxcnc (1:2.9.2) unstable; urgency=medium
412429
* motion: fix brake/direction setting when S command is sent.
413430
* motion.c: Improve handling of misc_error pin names See #2780 #2773
414431
* pmx483-test: change package message to python3-serial
415-
* pncconf - change spindle stepgen enable from spindle-enable to machine-is-on
416-
* pncconf -fix HAL load command for 2 serialports
432+
* pncconf
433+
- change spindle stepgen enable from spindle-enable to machine-is-on
434+
- fix HAL load command for 2 serialports
417435
* qtaxis -add version string to log
418436
* qtdragon -add a default 'factor' to avoid error message
419437
* qtdragon_hd -fix stylesheets for 5 axis, adjust qtdragon.ui
@@ -444,7 +462,8 @@ linuxcnc (1:2.9.2) unstable; urgency=medium
444462
* revert changes for strncat()
445463
* RTAI: Fix build against RTAI+GNU11
446464
* snprintf uses %d on a double (issue 2784)
447-
* stdglue.py: Fix error on loading stdglue remaps using an R word. (The previous code errored on attempted comparison between dict and float)
465+
* stdglue.py: Fix error on loading stdglue remaps using an R word.
466+
(The previous code errored on attempted comparison between dict and float)
448467
* tests: status.state should be checked against command execution status
449468
* Update build-dependency for OpenGL
450469
* Update combi_dro.py
@@ -681,7 +700,8 @@ linuxcnc (1:2.9.0) unstable; urgency=medium
681700
* mesa_pktgyro_test.comp Allow use of uarts > 0
682701
* mesa-7i65: fix a bug with stale data in fifo
683702
* message: Update HAL component docs to match behavior
684-
* Motion Type: Set the motion-type of rigid tap to 2 to match other spindle-sync cycles
703+
* Motion Type: Set the motion-type of rigid tap to 2
704+
to match other spindle-sync cycles
685705
* ohmic.comp - fix bugs
686706
* pncconf - Many updates
687707
* qt_istat.py: Fix typos
@@ -721,7 +741,7 @@ linuxcnc (1:2.9.0~pre1) UNRELEASED; urgency=medium
721741
* qtvcp -cam_align panel: add ability to set rotation increment
722742
* qtvcp -camview_widget: add the rotation increment display
723743
* qtvcp -cam_align panel: add window size setting option
724-
* docs: qtplasmac fix image, add deprication notice
744+
* docs: qtplasmac fix image, add deprecation notice
725745
* docs: add div2 to .gitignore
726746
* Merge pull request #2119 from Roguish000/component-div2
727747

@@ -861,8 +881,7 @@ linuxcnc (1:2.8.3) buster; urgency=low
861881
* Update for new version of Rpi400
862882
* mb2hal: added pins to manpage
863883
* Merge pull request #1641 from JTrantow/2.8
864-
* Change EDITOR = geany. Restore more generous dirhold and dirsetup
865-
timing.
884+
* Change EDITOR = geany. Restore more generous dirhold and dirsetup timing.
866885
* Updated the gantry example
867886
* linuxcncrsh: check for errors when creating listening socket
868887
* gscreen -fix error related to keyboard jogging and limit switch
@@ -1637,9 +1656,10 @@ linuxcnc (1:2.7.5) unstable; urgency=medium
16371656

16381657
* shuttlexpress: clean up the manpage & asciidocs
16391658

1640-
* GladeVCP: SpeedControl - changing limits do reset the increment
1641-
* GladeVCP: SpeedControl - set default increment after setting a new adjustment
1642-
* GladeVCP: SpeedControl - added widget icon
1659+
* GladeVCP: SpeedControl
1660+
- changing limits do reset the increment
1661+
- set default increment after setting a new adjustment
1662+
- added widget icon
16431663
* GladeVCP: tooledit.glade - corrected typo
16441664
* GladeVCP: hal_sourceview - fix permissions of created files
16451665
* GladevCP: gremlin - bugfix mouse button modes 4 and 6
@@ -1648,7 +1668,8 @@ linuxcnc (1:2.7.5) unstable; urgency=medium
16481668
* GladeVCP: Fix mdi error with tiny values
16491669
* pyngcgui: find gcmc if not specified in ini
16501670
* pyngcgui: remove mention of incorrect --height argument
1651-
* hal_glib: add callLevel to EMC_TASK_STAT class, to fix file-loaded bug
1671+
* hal_glib: add callLevel to EMC_TASK_STAT class,
1672+
to fix file-loaded bug
16521673

16531674
* stepconf: fix default pitch for A axis
16541675
* stepconf: dynamically show how step scale is calculated
@@ -1734,8 +1755,8 @@ linuxcnc (1:2.7.4) unstable; urgency=medium
17341755
* docs: github is more official now
17351756
* docs: fix a broken links
17361757
* docs: fix a couple of places to note nine axes or planes supported
1737-
* docs: add info on how to stop the Axis GUI "do you really want to
1738-
quit" dialog
1758+
* docs: add info on how to stop the Axis GUI
1759+
"do you really want to quit" dialog
17391760
* docs: add info about examples of logging from G-code
17401761
* docs: make example code easier to cut and paste
17411762
* docs: fix descriptions for G43.1 and G43.2
@@ -1766,8 +1787,8 @@ linuxcnc (1:2.7.4) unstable; urgency=medium
17661787
* add gantry.comp from Charles Steinkuehler
17671788
* xhc-hb04: fix negative jogs on non-x86 architectures
17681789
* hostmot2: improved sserial error handling (don't crash)
1769-
* hy-vfd: set spindle_at_speed correctly when spindle is running
1770-
reverse
1790+
* hy-vfd: set spindle_at_speed correctly
1791+
when spindle is running reverse
17711792
* serport: fix pin-1-in-not
17721793
* sim_parport: fix pin names of inverted input
17731794

@@ -1776,19 +1797,20 @@ linuxcnc (1:2.7.4) unstable; urgency=medium
17761797
* pncconf: fix setting or PID maxerror on servo configs
17771798
* sample configs: make sim/canterp.ini runnable
17781799
* sample configs: connect the orient mode pin to allow rotation
1779-
direction to be controlled in the VMC Vismach model
1800+
direction to be controlled in the VMC Vismach model
17801801

1781-
* emcmodule: Fix incorrect memory access by PyArg_ParseTuple and add better checks for string arguments
1802+
* emcmodule: Fix incorrect memory access by PyArg_ParseTuple and
1803+
add better checks for string arguments
17821804
* interp: fix two error message typos that would lead a user astray
17831805
* support RTAI 5
17841806
* better error reporting in rtapi/sim
17851807

1786-
* realtime script: wait for the last rtapi_app to die when stopping
1787-
realtime
1808+
* realtime script: wait for the last rtapi_app to die
1809+
when stopping realtime
17881810
* tests: verify that the exported realtime math functions exist
17891811
* build: remove unsupported docs/src/Makefile
1790-
* build: build-depend on docbook-xsl, instead of using the network at
1791-
build-time
1812+
* build: build-depend on docbook-xsl,
1813+
instead of using the network at build-time
17921814
* packaging: include udev rule file for ShuttleXpress USB jog pendant
17931815
* packaging: gmoccapy depends on gstreamer0.10-plugins-base
17941816
* packaging: use "set -e" to fail on error in the postinst script

debian/configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ EOF
2828

2929
cd "${0%/*}"
3030

31-
if [ "$1" == "-h" -o "$1" == "-help" -o "$1" == "--help" ]; then
31+
if [ "$1" == "-h" ] || [ "$1" == "-help" ] || [ "$1" == "--help" ]; then
3232
usage
3333
exit 0
3434
fi
@@ -99,7 +99,7 @@ DEBHELPER="debhelper (>= 12)"
9999
COMPAT="12"
100100

101101
case $DISTRIB_NAME in
102-
Ubuntu-21.*|Debian-11|Debian-11.*|Debian-12|Debian-12.*|Debian-testing|Debian-unstable)
102+
Ubuntu-21.*|Debian-11|Debian-11.*|Debian-12|Debian-12.*|Debian-13|Debian-13.*|Debian-testing|Debian-unstable)
103103
LIBREADLINE_DEV=libeditreadline-dev
104104
COMPAT=""
105105
DEBHELPER="debhelper-compat (= 13)"
@@ -195,4 +195,4 @@ fi
195195

196196

197197
rm -f ../build-stamp
198-
echo "successfully configured for '$DISTRIB_NAME'.."
198+
echo "Successfully configured for '$DISTRIB_NAME'."
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Just a couple of buttons to invoke a manual - xdg-open is a recommended dependency via xdg-utils
2-
linuxcnc-doc-de: desktop-command-not-in-package usr/share/applications/linuxcnc-documentation-de.desktop xdg-open
3-
linuxcnc-doc-de: desktop-command-not-in-package usr/share/applications/linuxcnc-gettingstarted-de.desktop xdg-open
4-
linuxcnc-doc-de: desktop-command-not-in-package usr/share/applications/linuxcnc-integratorinfo-de.desktop xdg-open
2+
linuxcnc-doc-de: desktop-command-not-in-package xdg-open [usr/share/applications/linuxcnc-integratorinfo_de.desktop]
3+
linuxcnc-doc-de: desktop-command-not-in-package xdg-open [usr/share/applications/linuxcnc-documentation_de.desktop]
4+
linuxcnc-doc-de: desktop-command-not-in-package x-www-browser [usr/share/applications/linuxcnc-gcoderef_de.desktop]
5+
linuxcnc-doc-de: desktop-command-not-in-package xdg-open [usr/share/applications/linuxcnc-gettingstarted_de.desktop]
6+

debian/linuxcnc.lintian-overrides.in

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,8 @@ linuxcnc-uspace: elevated-privileges 4755 root/root [usr/bin/rtapi_app]
1111
# that is intentional - for now
1212
linuxcnc-uspace: package-name-doesnt-match-sonames liblinuxcnchal0 liblinuxcncini0 libnml0 libposemath0 libpyplugin0 librs274-0 libtooldata0
1313

14-
# The man pages / documentation is likely to see an overhaul in a not too far future, prefer no to distract ourselves with these
15-
linuxcnc-uspace: groff-message 19: can't open '../man/images/toggle.ps': No such file or directory [usr/share/man/man9/toggle.9.gz:1]
16-
linuxcnc-uspace: groff-message 28: can't open '../man/images/toggle2nist.ps': No such file or directory [usr/share/man/man9/toggle2nist.9.gz:1]
17-
1814
# These are dlopened by rtapi_app, which is already linked against libc.
19-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/bldc.so]
20-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/lineardeltakins.so]
21-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/maxkins.so]
22-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/pentakins.so]
23-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/plasmac.so]
24-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/rosekins.so]
25-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/rotarydeltakins.so]
26-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/rotatekins.so]
27-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/scorbot-kins.so]
28-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/siggen.so]
29-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/tpmod.so]
30-
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/tripodkins.so]
15+
linuxcnc-uspace: library-not-linked-against-libc [usr/lib/linuxcnc/modules/*.so]
3116

17+
# Not of immediate concern - https://lintian.debian.org/tags/shared-library-lacks-prerequisites.html
18+
linuxcnc-uspace: shared-library-lacks-prerequisites [usr/lib/linuxcnc/modules/*.so]

debian/rules.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,8 @@ override_dh_compress:
129129

130130
override_dh_fixperms:
131131
dh_fixperms -X/linuxcnc_module_helper -X/rtapi_app
132-
# In case that only the indep packages are built
133-
if [ -r "$(DESTDIR)/usr/lib/tcltk/linuxcnc/linuxcnc.tcl" ]; then \
134-
chmod -x $(DESTDIR)/usr/lib/tcltk/linuxcnc/linuxcnc.tcl; \
135-
fi
132+
# FIXME: Who sets those -x flags? This better be fixed at the root of the problem - to be found.
133+
find debian -name linuxcnc.tcl -o -name cbutton.tcl -o -name mdi_text.py -o -name util.py | xargs -r chmod -x
136134
# override_dh_python3: # not executed, so we attach it to fixperms
137135
DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH` dh_python3
138136

0 commit comments

Comments
 (0)