From cc315f5c13dc7fa2c8efece28a5856e044c171431922a68401ab122aa9f47e56 Mon Sep 17 00:00:00 2001
From: Bin Li <binli@opensuse.org>
Date: Wed, 1 Feb 2012 04:07:56 +0000
Subject: [PATCH] Accepting request 101228 from home:elvigia:branches:network

- build pppoe-wrapper with PIE and full RELRO

OBS-URL: https://build.opensuse.org/request/show/101228
OBS-URL: https://build.opensuse.org/package/show/network/rp-pppoe?expand=0&rev=5
---
 rp-pppoe-pie.patch | 15 +++++++++++++++
 rp-pppoe.changes   |  5 +++++
 rp-pppoe.spec      |  6 ++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 rp-pppoe-pie.patch

diff --git a/rp-pppoe-pie.patch b/rp-pppoe-pie.patch
new file mode 100644
index 0000000..0a59e09
--- /dev/null
+++ b/rp-pppoe-pie.patch
@@ -0,0 +1,15 @@
+--- gui/Makefile.in.orig
++++ gui/Makefile.in
+@@ -37,10 +37,10 @@ all: pppoe-wrapper
+ 	@echo "Type 'make install' as root to install the software."
+ 
+ pppoe-wrapper: wrapper.o
+-	@CC@ -o pppoe-wrapper wrapper.o
++	@CC@ -pie  -Wl,-z,relro,-z,now -fwhole-program -o pppoe-wrapper wrapper.o
+ 
+ wrapper.o: wrapper.c
+-	@CC@ $(CFLAGS) -c -o wrapper.o wrapper.c
++	@CC@  -Wl,-z,relro,-z,now -fpie -fPIE -fwhole-program $(CFLAGS) -c -o wrapper.o wrapper.c
+ 
+ install: all
+ 	-mkdir -p $(DESTDIR)$(sbindir)
diff --git a/rp-pppoe.changes b/rp-pppoe.changes
index 581a4c9..47907fd 100644
--- a/rp-pppoe.changes
+++ b/rp-pppoe.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 24 00:48:39 UTC 2012 - crrodriguez@opensuse.org
+
+- build pppoe-wrapper with PIE and full RELRO 
+
 -------------------------------------------------------------------
 Tue Nov  3 19:09:43 UTC 2009 - coolo@novell.com
 
diff --git a/rp-pppoe.spec b/rp-pppoe.spec
index 91857bb..31d73ca 100644
--- a/rp-pppoe.spec
+++ b/rp-pppoe.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package rp-pppoe (Version 3.10)
+# spec file for package rp-pppoe
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,6 +38,7 @@ Patch6:         resolve-conf.diff
 Patch8:         strip.diff
 Patch10:        %{name}-3.10-init.patch
 Patch11:        %{name}-3.10-config.patch
+Patch12:        rp-pppoe-pie.patch
 Requires:       ppp >= 2.3.7
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq
@@ -67,6 +68,7 @@ Authors:
 %patch8
 %patch10 -p1
 %patch11 -p1
+%patch12
 #----------------------------------------------------------------------------------
 
 %build