Package: cal3d Version: 0.11.0-4 Severity: wishlist Tags: patch User: hardening-disc...@lists.alioth.debian.org Usertags: goal-hardening
Hi, Attached is a debdiff that enables build-arch/build-indep targets and enables hardning flags. The rules could be improved to only build the docs in build-indep; but given the short runtime for docs generation I figured it was not worth it. This would assist in "hardning" release goal[1] and the /proposed/ "build-arch" release goal[2]. Since the latter has not been accepted, this bug has been fixed as a "wishlist". As I recall you are busy at the moment, so I intend to NMU this package. If I do not hear from you in a week, I will upload it to DELAYED/10 as per devref 5.11.1[3] Thanks for considering, ~Niels [1] http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags [2] https://wiki.debian.org/ReleaseGoals/BuildArchTarget [3] http://www.debian.org/doc/manuals/developers-reference/pkgs.html#nmu
diff -u cal3d-0.11.0/debian/rules cal3d-0.11.0/debian/rules --- cal3d-0.11.0/debian/rules +++ cal3d-0.11.0/debian/rules @@ -5,22 +5,20 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CXXFLAGS = -Wall -g -fPIC LIBS = -lstdc++ ifneq (,$(findstring mips,$(DEB_BUILD_GNU_TYPE))) LIBS += -lm endif -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CXXFLAGS += -O0 -else - CXXFLAGS += -O2 -endif + +DPKG_EXPORT_BUILDFLAGS = 1 +DEB_CXXFLAGS_MAINT_APPEND = -Wall -fPIC +include /usr/share/dpkg/buildflags.mk config.status: configure dh_testdir - CXXFLAGS="$(CXXFLAGS)" LIBS="$(LIBS)" \ + LIBS="$(LIBS)" \ ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -34,7 +32,9 @@ sed -e 's/CC="gcc"/CC="g++"/g' libtool > lt.tmp && mv -f lt.tmp libtool -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: config.status dh_testdir diff -u cal3d-0.11.0/debian/control cal3d-0.11.0/debian/control --- cal3d-0.11.0/debian/control +++ cal3d-0.11.0/debian/control @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Michael Koch <konque...@gmx.de> -Build-Depends: debhelper (>= 5), doxygen +Build-Depends: debhelper (>= 5), doxygen, dpkg-dev (>= 1.16.1) Standards-Version: 3.8.2 Homepage: https://gna.org/projects/cal3d/ diff -u cal3d-0.11.0/debian/changelog cal3d-0.11.0/debian/changelog --- cal3d-0.11.0/debian/changelog +++ cal3d-0.11.0/debian/changelog @@ -1,3 +1,11 @@ +cal3d (0.11.0-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Added build-arch and build-indep targets. + * Enable harding flags by using dpkg-buildflags. + + -- Niels Thykier <ni...@thykier.net> Sun, 06 Nov 2011 13:55:19 +0100 + cal3d (0.11.0-4) unstable; urgency=low * Updated config.guess and config.sub (Closes: #528398).