rpms/acpid/devel acpid-1.0.6-makefile.patch, NONE, 1.1 acpid-1.0.6-return.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 acpid.spec, 1.20, 1.21 sources, 1.5, 1.6 acpid-1.0.3-conf.patch, 1.1, NONE acpid-1.0.3-makefile.patch, 1.1, NONE acpid-1.0.4-pie.patch, 1.1, NONE acpid-1.0.4-warning.patch, 1.2, NONE

[Zdenek Prikryl (zprikryl)]

Author: zprikryl

Update of /cvs/extras/rpms/acpid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19247

Modified Files:
	.cvsignore acpid.spec sources 
Added Files:
	acpid-1.0.6-makefile.patch acpid-1.0.6-return.patch 
Removed Files:
	acpid-1.0.3-conf.patch acpid-1.0.3-makefile.patch 
	acpid-1.0.4-pie.patch acpid-1.0.4-warning.patch 
Log Message:
Updated to version 1.0.6


acpid-1.0.6-makefile.patch:

--- NEW FILE acpid-1.0.6-makefile.patch ---
--- acpid-1.0.6/Makefile.flags	2007-06-30 21:15:45.000000000 +0200
+++ acpid-1.0.6/Makefile	2007-08-07 10:29:18.000000000 +0200
@@ -21,7 +21,8 @@ acpi_listen_OBJS = $(acpi_listen_SRCS:.c
 MAN8 = acpid.8 acpi_listen.8
 MAN8GZ = $(MAN8:.8=.8.gz)
 
-CFLAGS = -Wall -Werror -g $(DEFS)
+CFLAGS = -Wall -Werror -g $(DEFS) $(RPM_OPT_FLAGS) -fPIE
+LDFLAGS = -pie -Wl,-z,relro
 DEFS = -DVERSION="\"$(VERSION)\""
 
 all: $(PROGS)

acpid-1.0.6-return.patch:

--- NEW FILE acpid-1.0.6-return.patch ---
--- acpid-1.0.6/acpid.c.return	2007-05-25 06:19:23.000000000 +0200
+++ acpid-1.0.6/acpid.c	2007-08-07 10:30:35.000000000 +0200
@@ -387,9 +387,7 @@ daemonize(void)
 	umask(0);
 
 	/* get outta the way */
-	chdir("/");
-
-	return 0;
+	return chdir("/");
 }
 
 static int


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Mar 2005 22:38:33 -0000	1.5
+++ .cvsignore	10 Aug 2007 06:47:27 -0000	1.6
@@ -1 +1 @@
-acpid-1.0.4.tar.gz
+acpid-1.0.6.tar.gz


Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/acpid.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- acpid.spec	25 Jul 2007 08:59:47 -0000	1.20
+++ acpid.spec	10 Aug 2007 06:47:27 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
-Version: 1.0.4
-Release: 8%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -9,9 +9,8 @@
 Source2: acpid.init
 Source3: acpid.video.conf
 Source4: acpid.power.conf
-Patch1: acpid-1.0.3-makefile.patch
-Patch2: acpid-1.0.4-warning.patch
-Patch3: acpid-1.0.4-pie.patch
+Patch1: acpid-1.0.6-makefile.patch
+Patch2: acpid-1.0.6-return.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ia64 x86_64 %{ix86}
 URL: http://acpid.sourceforge.net/
@@ -27,8 +26,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .makefile
-%patch2 -p1 -b .warning
-%patch3 -p1 -b .pie
+%patch2 -p1 -b .return
 
 %build
 make %{?_smp_mflags}
@@ -87,6 +85,9 @@
 fi
 
 %changelog
+* Tue Aug 07 2007 Zdenek Prikryl <zdprikryl at redhat.com> - 1.0.6-1.fc8
+- Updated to version 1.0.6
+
 * Wed Jul 25 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.4-8.fc8
 - Fixed init script to comply with LSB standard
 - Resolves: #237754


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Mar 2005 22:38:33 -0000	1.5
+++ sources	10 Aug 2007 06:47:27 -0000	1.6
@@ -1 +1 @@
-3aff94e92186e99ed5fd6dcee2db7c74  acpid-1.0.4.tar.gz
+5c9b705700df51d232be223b6ab6414d  acpid-1.0.6.tar.gz


--- acpid-1.0.3-conf.patch DELETED ---


--- acpid-1.0.3-makefile.patch DELETED ---


--- acpid-1.0.4-pie.patch DELETED ---


--- acpid-1.0.4-warning.patch DELETED ---