[med-svn] [Git][med-team/edfbrowser][master] 2 commits: d/rules: flag -U_FORTIFY_SOURCE for blhc.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / edfbrowser


Commits:
6f8dd43e by Étienne Mollier at 2025-10-02T21:25:51+02:00
d/rules: flag -U_FORTIFY_SOURCE for blhc.

This change also packs a bit the d/rules file.

- - - - -
484dc32e by Étienne Mollier at 2025-10-02T21:31:25+02:00
d/changelog: initialise the changelog.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+edfbrowser (2.13+dfsg-2) UNRELEASED; urgency=medium
+
+  * d/rules: flag -U_FORTIFY_SOURCE for blhc.
+    This change also packs a bit the d/rules file.
+
+ -- Étienne Mollier <emollier at debian.org>  Thu, 02 Oct 2025 21:31:09 +0200
+
 edfbrowser (2.13+dfsg-1) unstable; urgency=medium
 
   * New upstream version 2.13+dfsg


=====================================
debian/rules
=====================================
@@ -1,30 +1,25 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-# export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
-
-# Until upstream feels confident with the use of source fortification,
-# we disable it.  See the discussion on upstream gitlab[1] for a status
-# on the matter.
-#
-# [1]: https://gitlab.com/Teuniz/EDFbrowser/-/commit/8a752be03e08ea124d3d25e01b5064d8108492cc
-export DEB_CPPFLAGS_MAINT_APPEND := -U_FORTIFY_SOURCE
-
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 export DEB_CXXFLAGS_MAINT_APPEND := -Wall -Wshadow -Wextra -ggdb3
-
 export QT_SELECT=qt5
 
 %:
 	dh $@
 
-override_dh_auto_configure:
-	dh_auto_configure
-	# libpthread is only used indirectly; no need for linking against it
+# libpthread is only used indirectly; no need for linking against it
+execute_after_dh_auto_configure:
 	sed -i -e 's/-lpthread//' Makefile
 
-override_dh_clean:
+# Until upstream feels confident with the use of source fortification,
+# we disable it.  See the discussion on upstream gitlab[1] for a status
+# on the matter.
+#
+# [1]: https://gitlab.com/Teuniz/EDFbrowser/-/commit/8a752be03e08ea124d3d25e01b5064d8108492cc
+export DEB_CPPFLAGS_MAINT_APPEND := -U_FORTIFY_SOURCE
+execute_before_dh_auto_build:
+	@echo 'blhc: ignore-line-regexp: .* -D_FORTIFY_SOURCE=2.*-U_FORTIFY_SOURCE.*'
+
+execute_before_dh_clean:
 	test ! -f Makefile  ||  $(MAKE) distclean
-	dh_clean



View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/-/compare/b69792b45f5bc1c032babbab01d18c5cd9a19e14...484dc32ec985713ebd14a5c446d909fb3236c5a9

-- 
View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/-/compare/b69792b45f5bc1c032babbab01d18c5cd9a19e14...484dc32ec985713ebd14a5c446d909fb3236c5a9
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/debian-med-commit/attachments/20251002/657b35dc/attachment-0001.htm>