Accepting request 56604 from Base:System

Accepted submit request 56604 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/56604
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=35

acpid-2.0.5-forking.patch

@@ -1,12 +0,0 @@
-diff -up acpid-2.0.5/acpid.c.forking acpid-2.0.5/acpid.c
---- acpid-2.0.5/acpid.c.forking	2010-03-28 15:54:23.000000000 +0200
-+++ acpid-2.0.5/acpid.c	2010-09-10 13:38:06.207131183 +0200
-@@ -333,7 +333,7 @@ daemonize(void)
- 	pid_t pid, sid;
- 
-     /* already a daemon */
--    if ( getppid() == 1 ) return 0;
-+    //if ( getppid() == 1 ) return 0;
- 
- 	/* fork off the parent process */
- 	pid = fork();

acpid-2.0.6-event-skip-messages.patch

@@ -1,15 +0,0 @@
---- event.c.orig
-+++ event.c
-@@ -124,8 +124,11 @@ acpid_read_conf(const char *confdir)
- 
- 		/* skip any files that don't match the run-parts convention */
- 		if (regexec(&preg, dirent->d_name, 0, NULL, 0) != 0) {
--			acpid_log(LOG_INFO, "skipping conf file %s/%s\n", 
-+			if(strcmp(dirent->d_name, ".") != 0 &&
-+			   strcmp(dirent->d_name, "..") != 0) {
-+				acpid_log(LOG_INFO, "skipping conf file %s/%s\n", 
- 				confdir, dirent->d_name);
-+			}
- 			continue;
- 		}
- 

acpid-2.0.6.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89db450ab9c740f24fb8324f75efebf38096afa0f4c5cabc4072441659059a33
-size 74689

acpid-2.0.7.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4c5e674176cd32d8d2547c7d0d13ad8c84045c96f5c430da2a82d099f98e09d
+size 73467

acpid.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Dec 22 03:36:31 UTC 2010 - aj@suse.de
+
+- Update to 2.0.7:
+  * Reduced the startup logging and skipped processing of "." and ".."
+    in the config files directory
+  * Added CD-related buttons.
+  * Removed the "getppid() == 1" hack from daemonize().  
+  * Added FD_CLOEXEC to the input layer fd's.
+  Obsoletes patches acpid-2.0.5-forking.patch and 
+  acpid-2.0.6-event-skip-messages.patch.
+
 -------------------------------------------------------------------
 Fri Nov 19 16:34:01 UTC 2010 - seife@opensuse.org
 

acpid.spec

@@ -20,7 +20,7 @@
 
 Name:           acpid
 Url:            http://tedfelix.com/linux/acpid-netlink.html
-Version:        2.0.6
+Version:        2.0.7
 Release:        4
 License:        GPLv2+
 Group:          System/Daemons
@@ -37,8 +37,6 @@ Source6:        thinkpad_handler
 Source7:        power_button
 Source8:        acpid.service
 Patch1:         acpid-makefile.patch
-Patch2:         acpid-2.0.5-forking.patch
-Patch3:         acpid-2.0.6-event-skip-messages.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %ix86 x86_64 ia64
 
@@ -62,8 +60,6 @@ Authors:
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3
 cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} .
 
 %build