From 204db71310e6f2661bcdbe30254dd127e2ad94af Mon Sep 17 00:00:00 2001
From: Phil Knirsch <pknirsch@fedoraproject.org>
Date: Oct 10 2006 04:34:30 +0000
Subject: - Made acpid a PIE binary (#210016)


---

diff --git a/acpid-1.0.4-pie.patch b/acpid-1.0.4-pie.patch
new file mode 100644
index 0000000..530c224
--- /dev/null
+++ b/acpid-1.0.4-pie.patch
@@ -0,0 +1,13 @@
+diff -ur acpid-1.0.4.orig/Makefile acpid-1.0.4/Makefile
+--- acpid-1.0.4.orig/Makefile	2006-10-08 09:48:31.000000000 -0400
++++ acpid-1.0.4/Makefile	2006-10-08 09:55:47.000000000 -0400
+@@ -21,7 +21,8 @@
+ MAN8 = acpid.8 acpi_listen.8
+ MAN8GZ = $(MAN8:.8=.8.gz)
+ 
+-CFLAGS = -Wall -Werror -g $(DEFS) $(RPM_OPT_FLAGS)
++CFLAGS = -Wall -Werror -g $(DEFS) $(RPM_OPT_FLAGS) -fPIE
++LDFLAGS = -pie -Wl,-z,relro
+ DEFS = -DVERSION="\"$(VERSION)\""
+ 
+ all: $(PROGS)
diff --git a/acpid.spec b/acpid.spec
index 9512ee6..96c67ad 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -9,8 +9,9 @@ Source1: acpid.logrotate
 Source2: acpid.init
 Source3: acpid.video.conf
 Source4: acpid.power.conf
-Patch2: acpid-1.0.3-makefile.patch
-Patch3: acpid-1.0.4-warning.patch
+Patch1: acpid-1.0.3-makefile.patch
+Patch2: acpid-1.0.4-warning.patch
+Patch3: acpid-1.0.4-pie.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch: ia64 x86_64 %{ix86}
 URL: http://acpid.sourceforge.net/
@@ -23,8 +24,9 @@ acpid is a daemon that dispatches ACPI events to user-space programs.
 
 %prep
 %setup
-%patch2 -p1 -b .makefile
-%patch3 -p1 -b .warning
+%patch1 -p1 -b .makefile
+%patch2 -p1 -b .warning
+%patch3 -p1 -b .pie
 
 %build
 make
@@ -87,6 +89,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Tue Oct 10 2006 Phil Knirsch <pknirsch@redhat.com> - 1.0.4-5
+- Made acpid a PIE binary (#210016)
+
 * Thu Aug 24 2006 Phil Knirsch <pknirsch@redhat.com> - 1.0.4-4
 - Made a better fix for the powerdown button which checks if g-p-m is running
 - Don't install sample.conf anymore, not needed