[Pkg-cgit-commits] [pkg-cgit] 11/18: Re-enable hardening flags

[Peter Colberg]

This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository pkg-cgit.

commit 16b76abb3e46f399d81dae4488f132a50e0acae4
Author: Peter Colberg <peter at colberg.org>
Date:   Fri Jun 10 08:08:54 2016 -0400

    Re-enable hardening flags
    
    The patch was disabled in commit 4c400d171fe18f1e6c8b691d87454e82e77d15e4.
---
 debian/patches/series |  1 +
 debian/rules          | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index cf00ccd..09d9632 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 # This is manually managed by users with dquilt (quilt(1) wrapper) etc.
 # Also this may be updated by dpkg-source(1) when making a package.
 debianize-makefile.patch
+add-hardening.patch
 assume-highlight-version-3-in-filter-script.patch
 add-highlighting-rules-to-cgit.css.patch
 use-debian-binary-name-rst2html.patch
diff --git a/debian/rules b/debian/rules
index ab0b9c9..35785ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,6 @@
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-
-CC =gcc
-CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CGIT_CFLAGS :=-Wall $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-LDFLAGS :=$(shell dpkg-buildflags --get LDFLAGS)
-
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cgit/pkg-cgit.git