forked from pool/acpid
Accepting request 50420 from Base:System
Copy from Base:System/acpid based on submit request 50420 from user a_jaeger OBS-URL: https://build.opensuse.org/request/show/50420 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=30
This commit is contained in:
commit
326cb95210
15
acpid-2.0.6-event-skip-messages.patch
Normal file
15
acpid-2.0.6-event-skip-messages.patch
Normal file
@ -0,0 +1,15 @@
|
||||
--- 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;
|
||||
}
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 12 18:51:58 UTC 2010 - cristian.rodriguez@opensuse.org
|
||||
|
||||
- fix logic
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 12 15:28:20 UTC 2010 - cristian.rodriguez@opensuse.org
|
||||
|
||||
- Do not warn on "skipping .. and ." directory entries
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 2 19:49:08 UTC 2010 - aj@suse.de
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
Name: acpid
|
||||
Url: http://tedfelix.com/linux/acpid-netlink.html
|
||||
Version: 2.0.6
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: GPLv2+
|
||||
Group: System/Daemons
|
||||
AutoReqProv: on
|
||||
@ -38,6 +38,7 @@ 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,6 +63,7 @@ Authors:
|
||||
%setup -q
|
||||
%patch1 -p0
|
||||
%patch2 -p1
|
||||
%patch3
|
||||
cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} .
|
||||
|
||||
%build
|
||||
|
Loading…
x
Reference in New Issue
Block a user