build with PIE flags

2013-06-13 16:28:27 +04:00 · 2013-06-13 16:28:27 +04:00 · d6b016fcee
commit d6b016fcee
parent 49fe18a911
2 changed files with 123 additions and 1 deletions
--- a/irda-utils-0.9.18-PIE.patch
+++ b/irda-utils-0.9.18-PIE.patch
@ -0,0 +1,113 @@
+diff --git a/findchip/Makefile b/findchip/Makefile
+index 7428617..0937827 100644
+--- a/findchip/Makefile
+++ b/findchip/Makefile
+@@ -47,7 +47,7 @@ all: findchip
+ 
+ findchip: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@
+	$(ECMD)$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) -o $@
+ 
+ 
+ clean:
+diff --git a/irattach/Makefile b/irattach/Makefile
+index e70de61..76383c2 100644
+--- a/irattach/Makefile
+++ b/irattach/Makefile
+@@ -28,7 +28,7 @@ include ../output.mak
+ CC           = gcc
+ LD           = ld
+ RM           = rm -f
+-CFLAGS       = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES)
+CFLAGS       = -O2 -W -Wall -Wstrict-prototypes -Wshadow $(SYS_INCLUDES) $(RPM_OPT_FLAGS)
+ 
+ SYS_INCLUDES = -I/usr/include
+ SYS_LIBPATH  = -L/usr/lib -L/usr/local/lib 
+@@ -49,13 +49,13 @@ all: $(TARGETS)
+ 
+ irattach: irattach.o util.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
+	$(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
+ 
+ 
+ 
+ dongle_attach: dongle_attach.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
+	$(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
+ 
+ 
+ install: $(TARGETS)
+diff --git a/irdadump/Makefile b/irdadump/Makefile
+index bd21abb..e7d8929 100644
+--- a/irdadump/Makefile
+++ b/irdadump/Makefile
+@@ -19,7 +19,7 @@ SYS_INCLUDES = -I/usr/include
+ SYS_LIBRARIES = 
+ SYS_LIBPATH = -L/usr/lib -L/usr/local/lib 
+ 
+-CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0`
+CFLAGS= -O2 -W -Wall -I. `pkg-config --cflags glib-2.0` $(RPM_OPT_FLAGS)
+ 
+ LIBIRDADUMP_OBJS = irdadump.o irlap.o irlmp.o obex.o ircomm.o netbuf.o capture.o
+ IRDADUMP_OBJS = main.o
+@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
+ 
+ irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) $(LIBRARIES) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+	$(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARIES) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+ 	#$(ECMD)$(CC) $(CFLAGS) `pkg-config --cflags --libs glib-2.0` -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+ 
+ 
+diff --git a/irdaping/Makefile b/irdaping/Makefile
+index ef84acd..cd64c90 100644
+--- a/irdaping/Makefile
+++ b/irdaping/Makefile
+@@ -56,7 +56,7 @@ all: $(TARGETS)
+ 
+ irdaping: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+	$(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+ 
+ 
+ .c.o:
+diff --git a/irnetd/Makefile b/irnetd/Makefile
+index 1fb1571..5efbc4a 100644
+--- a/irnetd/Makefile
+++ b/irnetd/Makefile
+@@ -50,7 +50,7 @@ all: $(TARGETS)
+ 
+ irnetd: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+	$(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
+ 
+ 
+ install: irnetd
+diff --git a/psion/Makefile b/psion/Makefile
+index 001926c..5d7cd7f 100644
+--- a/psion/Makefile
+++ b/psion/Makefile
+@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
+ 
+ irpsion5: 
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@
+	$(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@
+diff --git a/tekram/Makefile b/tekram/Makefile
+index e10d116..65996e6 100644
+--- a/tekram/Makefile
+++ b/tekram/Makefile
+@@ -55,7 +55,7 @@ all: irkbd
+ 
+ irkbd: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(OBJS) -o $@
+	$(ECMD)$(CC) $(LDFLAGS) $(OBJS) -o $@
+ 
+ 
+ .c.o:
--- a/irda-utils.spec
+++ b/irda-utils.spec
@ -1,7 +1,9 @@
+%global _hardened_build 1
+
 Summary:         Utilities for infrared communication between devices
 Name:            irda-utils
 Version:         0.9.18
-Release:         17%{?dist}
+Release:         18%{?dist}
 Url:             http://irda.sourceforge.net
 License:         GPLv2+
 Group:           Applications/System
@ -18,6 +20,7 @@ Patch4: irda-utils-0.9.17-makefile.patch
 Patch5: irda-utils-0.9.18-smcdisable.patch
 Patch6: irda-utils-0.9.18-root.patch
 Patch7: irda-utils-0.9.18-man.patch
+Patch8: irda-utils-0.9.18-PIE.patch
 BuildRequires: glib2-devel
 BuildRequires: systemd-units

@ -55,10 +58,13 @@ actually implemented outside the kernel.
 gunzip man/irnet.4.gz man/irda.7.gz
 %patch7 -p1
 gzip -9 man/irnet.4 man/irda.7
+%patch8 -p1


 %build
+export LDFLAGS="%{?__global_ldflags}"
 make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" \
+   LDFLAGS="%{?__global_ldflags}" \
   CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}


@ -120,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Thu Jun 13 2013 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-18
+- build with PIE flags (#955165)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild