From 151ee940c8cd670deedbe4ddfee0887a7b726f43 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 5 Oct 2013 15:11:10 -0600 Subject: [PATCH] Fix signed integer warning; debian build hardening --- debian/control | 2 +- debian/rules | 11 ++++++++++- wdq2wav.cpp | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index c11accb..69456c3 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: wdq2wav Section: contrib/utils Priority: extra Maintainer: Kevin M. Rosenberg -Build-Depends: debhelper (>> 7.0.0) +Build-Depends: debhelper (>> 7.0.0), hardening-wrapper Standards-Version: 3.9.4.0 Homepage: http://files.b9.com/wdq2wav/ Vcs-Git: git://git.b9.com/wdq2wav.git diff --git a/debian/rules b/debian/rules index 477eb79..d3f0854 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,15 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif +export DEB_BUILD_HARDENING=1 +export DPKG_EXPORT_BUILDFLAGS=1 +export DEB_BUILD_MAINT_OPTIONS="hardening=+all" +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + + configure: configure-stamp configure-stamp: dh_testdir @@ -37,7 +46,7 @@ install: build dh_prep dh_installdirs DPKG_EXPORT_BUILDFLAGS=1 - env DEB_BUILD_MAINT_OPTIONS="hardening=+all" DPKG_EXPORT_BUILDFLAGS=1 CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" $(MAKE) + $(MAKE) dh_install wdq2wav usr/bin binary-indep: diff --git a/wdq2wav.cpp b/wdq2wav.cpp index 81b1c9c..ad977f2 100644 --- a/wdq2wav.cpp +++ b/wdq2wav.cpp @@ -287,7 +287,7 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool p if (! g_dry_run && !g_dont_demean) { std::cout << " (removing)\n"; int mean = nearest(wdq_channel.m_raw_mean); - for (int i = 0; i < wdq.m_nSamples; i++) + for (unsigned int i = 0; i < wdq.m_nSamples; i++) wdq_channel.m_data[i] -= mean; } else { std::cout << " (not removing)\n"; -- 2.34.1