[med-svn] [Git][med-team/dicom3tools][master] 3 commits: Add hardening buildflags

[Mohd Bilal (@rmb)]

Mohd  Bilal pushed to branch master at Debian Med / dicom3tools


Commits:
6163ead9 by Mohammed Bilal at 2022-07-04T07:23:14+00:00
Add hardening buildflags

- - - - -
7ea6051b by Mohammed Bilal at 2022-07-04T07:28:57+00:00
skip line that causes blhc failure

- - - - -
95f52c92 by Mohammed Bilal at 2022-07-04T07:29:31+00:00
Update changelog

- - - - -


3 changed files:

- debian/changelog
- debian/rules
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+dicom3tools (1.00~20220618093127-3) UNRELEASED; urgency=medium
+
+  * Add hardening buildflags
+  * skip line that causes blhc failure
+
+ -- Mohammed Bilal <mdbilal at disroot.org>  Mon, 04 Jul 2022 07:29:06 +0000
+
 dicom3tools (1.00~20220618093127-2) unstable; urgency=medium
 
   [ Mohammed Bilal ]


=====================================
debian/rules
=====================================
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
--include /usr/share/dpkg/buildflags.mk
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 VER_MAJOR = 1
 VER_MINOR = 00
@@ -34,7 +35,7 @@ override_dh_auto_configure:
 	imake -I./config -DTmpPath=/tmp -DOptimizeLevel=-O2 $(IMAKEFLAGS)
 
 override_dh_auto_build:
-	$(MAKE) World C_DEBUGFLAGS="$(CFLAGS)" CPLUSPLUS_DEBUGFLAGS="$(CXXFLAGS)" C_EXTRA_LOAD_FLAGS="$(LDFLAGS)" CPLUSPLUS_EXTRA_LOAD_FLAGS="$(LDFLAGS)"
+	$(MAKE) World C_DEBUGFLAGS="$(CFLAGS)" CPLUSPLUS_DEBUGFLAGS="$(CXXFLAGS)" C_EXTRA_LOAD_FLAGS="$(LDFLAGS)" CPLUSPLUS_EXTRA_LOAD_FLAGS="$(LDFLAGS)" CPLUSPLUS_OPTIONS="$(CXXFLAGS) $(CPPFLAGS) CPLUSPLUS_OPTIONS="$(CXXFLAGS) $(CPPFLAGS)"
 
 override_dh_installman:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/dicom3tools install.man


=====================================
debian/salsa-ci.yml
=====================================
@@ -2,3 +2,6 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+variables:
+# Getting blhc failure for this line. Needs further inspection of the build system to fix this
+  SALSA_CI_BLHC_ARGS: '--ignore-line=andump.cc'



View it on GitLab: https://salsa.debian.org/med-team/dicom3tools/-/compare/2b868ec6210ab62dd22ea6ca40707e86a592b67e...95f52c925d8f5ef95b2e090e81ae9ffd3e1f4eaf

-- 
View it on GitLab: https://salsa.debian.org/med-team/dicom3tools/-/compare/2b868ec6210ab62dd22ea6ca40707e86a592b67e...95f52c925d8f5ef95b2e090e81ae9ffd3e1f4eaf
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/20220704/76239dcc/attachment-0001.htm>