diff mbox

Build using dpkg-dev's hardening support.

Message ID 20161005111225.15324-1-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King Oct. 5, 2016, 11:12 a.m. UTC
From: Colin Ian King <colin.king@canonical.com>

Signed-off-by: Matthias Klose <doko@ubuntu.com>
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 debian/control | 2 +-
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Alex Hung Oct. 5, 2016, 11:21 p.m. UTC | #1
On 2016-10-05 04:12 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Matthias Klose <doko@ubuntu.com>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  debian/control | 2 +-
>  debian/rules   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/debian/control b/debian/control
> index b993740..eb0daa8 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -4,7 +4,7 @@ Priority: optional
>  Maintainer: Firmware Testing Team <fwts-devel@lists.ubuntu.com>
>  Uploaders: Colin King <colin.king@ubuntu.com>, Keng-Yu Lin <kengyu@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@canonical.com>
>  Standards-Version: 3.9.6
> -Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, hardening-wrapper, dh-autoreconf, dkms, libglib2.0-dev, pkg-config, libfdt-dev
> +Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, dh-autoreconf, dkms, libglib2.0-dev, pkg-config, libfdt-dev
>
>  Package: fwts
>  Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x
> diff --git a/debian/rules b/debian/rules
> index cf6e830..c24df00 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -1,6 +1,6 @@
>  #!/usr/bin/make -f
>
> -export DEB_BUILD_HARDENING=1
> +export DEB_BUILD_MAINT_OPTIONS=hardening=+all
>
>  DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
>
>

Acked-by: Alex Hung <alex.hung@canonicall.com>
Ivan Hu Oct. 12, 2016, 7:21 a.m. UTC | #2
On 2016年10月05日 19:12, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Signed-off-by: Matthias Klose <doko@ubuntu.com>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  debian/control | 2 +-
>  debian/rules   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/debian/control b/debian/control
> index b993740..eb0daa8 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -4,7 +4,7 @@ Priority: optional
>  Maintainer: Firmware Testing Team <fwts-devel@lists.ubuntu.com>
>  Uploaders: Colin King <colin.king@ubuntu.com>, Keng-Yu Lin <kengyu@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@canonical.com>
>  Standards-Version: 3.9.6
> -Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, hardening-wrapper, dh-autoreconf, dkms, libglib2.0-dev, pkg-config, libfdt-dev
> +Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, dh-autoreconf, dkms, libglib2.0-dev, pkg-config, libfdt-dev
>
>  Package: fwts
>  Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x
> diff --git a/debian/rules b/debian/rules
> index cf6e830..c24df00 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -1,6 +1,6 @@
>  #!/usr/bin/make -f
>
> -export DEB_BUILD_HARDENING=1
> +export DEB_BUILD_MAINT_OPTIONS=hardening=+all
>
>  DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
>
>

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/debian/control b/debian/control
index b993740..eb0daa8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@  Priority: optional
 Maintainer: Firmware Testing Team <fwts-devel@lists.ubuntu.com>
 Uploaders: Colin King <colin.king@ubuntu.com>, Keng-Yu Lin <kengyu@ubuntu.com>, Alex Hung <alex.hung@canonical.com>, Ivan Hu <ivan.hu@canonical.com>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, hardening-wrapper, dh-autoreconf, dkms, libglib2.0-dev, pkg-config, libfdt-dev
+Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, libjson0-dev | libjson-c-dev (>= 0.9), flex, bison, dh-autoreconf, dkms, libglib2.0-dev, pkg-config, libfdt-dev
 
 Package: fwts
 Architecture: i386 amd64 armel armhf arm64 ppc64 ppc64el s390x
diff --git a/debian/rules b/debian/rules
index cf6e830..c24df00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@ 
 #!/usr/bin/make -f
 
-export DEB_BUILD_HARDENING=1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)