← Back to branch summary

~ubuntu-branches/ubuntu/wily/keyutils/wily

« back to all changes in this revision

Viewing changes to debian/patches/0005-hardening.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-10-16 11:45:19 UTC
  • mfrom: (1.1.7) (10.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20141016114519-cqt8zwrg92c31m31
Tags: 1.5.9-5ubuntu1
https://launchpad.net/bugs/1381973
Disable the tests, hanging on the distro buildd kernels (12.04 LTS).
Verified that the tests succeed with the 14.04 LTS kernels.
Addresses: LP: #1381973.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0005-hardening.patch
1
 
Author: Simon Ruderich <simon@ruderich.org>
2
 
Description:
3
 
 Use build flags from environment (dpkg-buildflags). Necessary for hardening
4
 
 flags. Also strip -pie/-fPIE from CFLAGS/LDFLAGS when used to link libraries.
5
 
 It conflicts with -fPIC (Closes: #661393).
6
 
 
7
 
diff -Naurp keyutils.orig/Makefile keyutils/Makefile
8
 
--- keyutils.orig/Makefile
9
 
+++ keyutils/Makefile
 
1
From: Simon Ruderich <simon@ruderich.org>
 
2
Date: Thu, 22 Mar 2012 22:38:42 +0100
 
3
Subject: Use build flags from environment (dpkg-buildflags)
 
4
 
 
5
Necessary for hardening flags. Also strip -pie/-fPIE from CFLAGS/LDFLAGS when
 
6
used to link libraries. It conflicts with -fPIC.
 
7
 
 
8
Bug-Debian: http://bugs.debian.org/661393
 
9
Forwarded: not-needed
 
10
Last-Update: 2014-05-18
 
11
 
 
12
Index: keyutils-1.5.9/Makefile
 
13
===================================================================
 
14
--- keyutils-1.5.9.orig/Makefile
 
15
+++ keyutils-1.5.9/Makefile
10
16
@@ -1,5 +1,9 @@
11
17
-CPPFLAGS       := -I.
12
18
-CFLAGS         := -g -Wall -Werror
19
25
 INSTALL                := install
20
26
 DESTDIR                :=
21
27
 SPECFILE       := keyutils.spec
22
 
@@ -118,10 +122,10 @@ $(SONAME): $(LIBNAME)
 
28
@@ -125,10 +129,10 @@ $(SONAME): $(LIBNAME)
23
29
 LIBVERS := -shared -Wl,-soname,$(SONAME) -Wl,--version-script,version.lds
24
30
 
25
31
 $(LIBNAME): keyutils.os version.lds Makefile