[Git][java-team/tuxguitar][master] 2 commits: Remove -fcf-protection from 16-fix-cflags.patch
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Wed Jan 8 20:54:49 GMT 2025
Tony Mancill pushed to branch master at Debian Java Maintainers / tuxguitar
Commits:
61c624d6 by tony mancill at 2025-01-08T12:46:32-08:00
Remove -fcf-protection from 16-fix-cflags.patch
- - - - -
ab88ad9c by tony mancill at 2025-01-08T12:48:41-08:00
Prepare changelog for upload
- - - - -
2 changed files:
- debian/changelog
- debian/patches/16-fix-cflags.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+tuxguitar (1.6.6+dfsg1-2) unstable; urgency=medium
+
+ * QA upload.
+ * Remove -fcf-protection from 16-fix-cflags.patch for builds
+ on architectures other than amd64.
+ Thank you to Helmar Gerloni for triaging the issue.
+
+ -- tony mancill <tmancill at debian.org> Wed, 08 Jan 2025 12:47:22 -0800
+
tuxguitar (1.6.6+dfsg1-1) unstable; urgency=medium
* QA upload.
=====================================
debian/patches/16-fix-cflags.patch
=====================================
@@ -1,9 +1,10 @@
Description: Add -g flag for debugging symbols needed in dbgsym packages and
- hardening flags suggested by blhc
+ hardening flags suggested by blhc; -fcf-protection not added
+ because it fails on architectures other than amd64
Origin: vendor
Forwarded: no
Author: Helmar Gerloni <helmar at gerloni.net>
-Last-Update: 2025-01-04
+Last-Update: 2025-01-08
--- a/desktop/build-scripts/native-modules/tuxguitar-alsa-linux/pom.xml
+++ b/desktop/build-scripts/native-modules/tuxguitar-alsa-linux/pom.xml
@@ -13,7 +14,7 @@ Last-Update: 2025-01-04
<tuxguitar-alsa.jni.cc>${tuxguitar.jni.cc}</tuxguitar-alsa.jni.cc>
- <tuxguitar-alsa.jni.cflags>${tuxguitar.jni.header.path} -fPIC</tuxguitar-alsa.jni.cflags>
- <tuxguitar-alsa.jni.ldflags>-fPIC</tuxguitar-alsa.jni.ldflags>
-+ <tuxguitar-alsa.jni.cflags>${tuxguitar.jni.header.path} -fPIC -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection</tuxguitar-alsa.jni.cflags>
++ <tuxguitar-alsa.jni.cflags>${tuxguitar.jni.header.path} -fPIC -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security</tuxguitar-alsa.jni.cflags>
+ <tuxguitar-alsa.jni.ldflags>-fPIC -Wl,-z,relro -Wl,-z,now</tuxguitar-alsa.jni.ldflags>
<tuxguitar-alsa.jni.ldlibs>-lasound</tuxguitar-alsa.jni.ldlibs>
<tuxguitar-alsa.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-alsa.jni.ldpath>
@@ -26,7 +27,7 @@ Last-Update: 2025-01-04
<tuxguitar-fluidsynth.jni.cc>${tuxguitar.jni.cc}</tuxguitar-fluidsynth.jni.cc>
- <tuxguitar-fluidsynth.jni.cflags>${tuxguitar.jni.header.path} -fPIC</tuxguitar-fluidsynth.jni.cflags>
- <tuxguitar-fluidsynth.jni.ldflags>-fPIC</tuxguitar-fluidsynth.jni.ldflags>
-+ <tuxguitar-fluidsynth.jni.cflags>${tuxguitar.jni.header.path} -fPIC -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection</tuxguitar-fluidsynth.jni.cflags>
++ <tuxguitar-fluidsynth.jni.cflags>${tuxguitar.jni.header.path} -fPIC -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security</tuxguitar-fluidsynth.jni.cflags>
+ <tuxguitar-fluidsynth.jni.ldflags>-fPIC -Wl,-z,relro -Wl,-z,now</tuxguitar-fluidsynth.jni.ldflags>
<tuxguitar-fluidsynth.jni.ldlibs>-lfluidsynth</tuxguitar-fluidsynth.jni.ldlibs>
<tuxguitar-fluidsynth.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-fluidsynth.jni.ldpath>
@@ -39,7 +40,7 @@ Last-Update: 2025-01-04
<tuxguitar-jack.jni.cc>${tuxguitar.jni.cc}</tuxguitar-jack.jni.cc>
- <tuxguitar-jack.jni.cflags>${tuxguitar.jni.header.path} -fPIC</tuxguitar-jack.jni.cflags>
- <tuxguitar-jack.jni.ldflags>-fPIC</tuxguitar-jack.jni.ldflags>
-+ <tuxguitar-jack.jni.cflags>${tuxguitar.jni.header.path} -fPIC -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection</tuxguitar-jack.jni.cflags>
++ <tuxguitar-jack.jni.cflags>${tuxguitar.jni.header.path} -fPIC -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security</tuxguitar-jack.jni.cflags>
+ <tuxguitar-jack.jni.ldflags>-fPIC -Wl,-z,relro -Wl,-z,now</tuxguitar-jack.jni.ldflags>
<tuxguitar-jack.jni.ldlibs>`pkg-config --libs jack`</tuxguitar-jack.jni.ldlibs>
<tuxguitar-jack.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-jack.jni.ldpath>
@@ -52,7 +53,7 @@ Last-Update: 2025-01-04
<tuxguitar-synth-lv2.jni.rm>${tuxguitar.jni.rm}</tuxguitar-synth-lv2.jni.rm>
- <tuxguitar-synth-lv2.jni.cflags>${tuxguitar.jni.header.path} -I/usr/include/lilv-0/lilv -fPIC -fpermissive</tuxguitar-synth-lv2.jni.cflags>
- <tuxguitar-synth-lv2.jni.ldflags>-fPIC</tuxguitar-synth-lv2.jni.ldflags>
-+ <tuxguitar-synth-lv2.jni.cflags>${tuxguitar.jni.header.path} -I/usr/include/lilv-0/lilv -fPIC -fpermissive -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -fcf-protection</tuxguitar-synth-lv2.jni.cflags>
++ <tuxguitar-synth-lv2.jni.cflags>${tuxguitar.jni.header.path} -I/usr/include/lilv-0/lilv -fPIC -fpermissive -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2</tuxguitar-synth-lv2.jni.cflags>
+ <tuxguitar-synth-lv2.jni.ldflags>-fPIC -Wl,-z,relro -Wl,-z,now</tuxguitar-synth-lv2.jni.ldflags>
<tuxguitar-synth-lv2.jni.ldlibs>-llilv-0 -lsuil-0</tuxguitar-synth-lv2.jni.ldlibs>
<tuxguitar-synth-lv2.jni.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-synth-lv2.jni.ldpath>
@@ -63,7 +64,7 @@ Last-Update: 2025-01-04
<tuxguitar-synth-lv2.cxx.rm>${tuxguitar.jni.rm}</tuxguitar-synth-lv2.cxx.rm>
- <tuxguitar-synth-lv2.cxx.cflags>-I/usr/include/lilv-0/lilv -I/usr/include/suil-0/suil -I`pkg-config Qt5Core --cflags` `pkg-config Qt5Widgets --cflags` -fPIC -fpermissive</tuxguitar-synth-lv2.cxx.cflags>
- <tuxguitar-synth-lv2.cxx.ldflags>-fPIC</tuxguitar-synth-lv2.cxx.ldflags>
-+ <tuxguitar-synth-lv2.cxx.cflags>-I/usr/include/lilv-0/lilv -I/usr/include/suil-0/suil -I`pkg-config Qt5Core --cflags` `pkg-config Qt5Widgets --cflags` -fPIC -fpermissive -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -fcf-protection</tuxguitar-synth-lv2.cxx.cflags>
++ <tuxguitar-synth-lv2.cxx.cflags>-I/usr/include/lilv-0/lilv -I/usr/include/suil-0/suil -I`pkg-config Qt5Core --cflags` `pkg-config Qt5Widgets --cflags` -fPIC -fpermissive -g -O2 -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2</tuxguitar-synth-lv2.cxx.cflags>
+ <tuxguitar-synth-lv2.cxx.ldflags>-fPIC -Wl,-z,relro -Wl,-z,now</tuxguitar-synth-lv2.cxx.ldflags>
<tuxguitar-synth-lv2.cxx.ldlibs>-llilv-0 -lsuil-0 -lpthread `pkg-config Qt5Core --libs` `pkg-config Qt5Widgets --libs`</tuxguitar-synth-lv2.cxx.ldlibs>
<tuxguitar-synth-lv2.cxx.ldpath>${tuxguitar.jni.ldpath}</tuxguitar-synth-lv2.cxx.ldpath>
View it on GitLab: https://salsa.debian.org/java-team/tuxguitar/-/compare/1c9c44a48ad4f80a60105751660a1629b71df810...ab88ad9c740539549e7cb487cc89b7f3a196bc6a
--
View it on GitLab: https://salsa.debian.org/java-team/tuxguitar/-/compare/1c9c44a48ad4f80a60105751660a1629b71df810...ab88ad9c740539549e7cb487cc89b7f3a196bc6a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20250108/c84ddb56/attachment.htm>
More information about the pkg-java-commits
mailing list