[libocas] 06/14: d/patches: Update patch Properly-build-shared-and-static-libraries-programs

[Christian Kastner]

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

ckk pushed a commit to branch master
in repository libocas.

commit 8dfa6dc98f69edbeb9ff149663c778009ddda680
Author: Christian Kastner <ckk at kvr.at>
Date:   Fri Apr 22 23:47:52 2016 +0200

    d/patches: Update patch Properly-build-shared-and-static-libraries-programs
    
    Filter out -pie, -fpie, and -fPIE when building the shared library so that
    hardening=+all can be used.
---
 ...y-build-shared-and-static-libraries-programs.patch | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/patches/Properly-build-shared-and-static-libraries-programs.patch b/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
index 2ee53ec..d6107bc 100644
--- a/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
+++ b/debian/patches/Properly-build-shared-and-static-libraries-programs.patch
@@ -6,17 +6,17 @@ Modify upstream's Makefile to properly build shared and static libraries, and
 link upstream's programs to the shared libraries. Furthermore, provide an
 install target.
 
-Forwarded: no
-Last-Update: 2014-07-26
+Forwarded: not-needed
+Last-Update: 2016-04-22
 ---
- Makefile | 74 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
- 1 file changed, 56 insertions(+), 18 deletions(-)
+ Makefile | 75 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 57 insertions(+), 18 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index f847bf9..8379c16 100644
+index f847bf9..51d2b5b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -3,12 +3,28 @@ MEX := mex
+@@ -3,12 +3,29 @@ MEX := mex
  MEXFLAGS := $(shell if uname -m | grep -q x86_64 ; then echo -largeArrayDims ; fi)
  MEXSUFFIX := $(shell if uname -m | grep -q x86_64 ; then echo mexa64 ; else echo mexglx ; fi)
  CC := gcc
@@ -30,8 +30,9 @@ index f847bf9..8379c16 100644
 +LDFLAGS +=
 +LIBS += -lm
 +
-+LIB_CFLAGS = $(CFLAGS) -fPIC
-+LIB_LDFLAGS = $(LDFLAGS)
++# Libraries must not be compiled/linked with -pie, -fpie or -FPIE
++LIB_CFLAGS = $(filter-out -fPIE,$(CFLAGS)) -fPIC
++LIB_LDFLAGS = $(filter-out -fPIE, $(filter-out -pie,$(LDFLAGS)))
 +LIB_LIBS = $(LIBS)
 +
 +PROG_CFLAGS = $(CFLAGS)
@@ -50,7 +51,7 @@ index f847bf9..8379c16 100644
  
  ifeq (yes,$(MEXDETECTED))
  all: svmocas_nnw.$(MEXSUFFIX) svmocas.$(MEXSUFFIX) svmocas_light.$(MEXSUFFIX) linclassif_light.$(MEXSUFFIX) libocas.so svmocas msvmocas linclassif msvmocas.$(MEXSUFFIX) msvmocas_light.$(MEXSUFFIX) compute_auc.$(MEXSUFFIX) svmocas_lbp.$(MEXSUFFIX) svmocas_bool.$(MEXSUFFIX) lbppyr_features.$(MEXSUFFIX) load_svmlight_file.$(MEXSUFFIX)
-@@ -53,21 +69,43 @@ load_svmlight_file.$(MEXSUFFIX): load_svmlight_file.c lib_svmlight_format.c lib_
+@@ -53,21 +70,43 @@ load_svmlight_file.$(MEXSUFFIX): load_svmlight_file.c lib_svmlight_format.c lib_
  		$(MEX) $(MEXFLAGS) -DLIBOCAS_MATLAB -O -output load_svmlight_file.$(MEXSUFFIX) load_svmlight_file.c lib_svmlight_format.c
  
  else 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libocas.git