Hello community, here is the log from the commit of package acpid for openSUSE:Factory checked in at 2018-06-19 12:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/acpid (Old) and /work/SRC/openSUSE:Factory/.acpid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "acpid" Tue Jun 19 12:05:14 2018 rev:77 rq:617434 version:2.0.29 Changes: -------- --- /work/SRC/openSUSE:Factory/acpid/acpid.changes 2017-11-10 14:58:08.118476736 +0100 +++ /work/SRC/openSUSE:Factory/.acpid.new/acpid.changes 2018-06-19 12:05:17.442407101 +0200 @@ -1,0 +2,8 @@ +Sat Jun 9 22:37:54 UTC 2018 - [email protected] + +- Update to 2.0.29: + * Decouple -d and -f options. Bug #15. + * Rename acpid_debug -> debug_level. + * Log missing input layer as a warning. + +------------------------------------------------------------------- Old: ---- acpid-2.0.28.tar.xz New: ---- acpid-2.0.29.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ --- /var/tmp/diff_new_pack.xsYHPx/_old 2018-06-19 12:05:18.514367301 +0200 +++ /var/tmp/diff_new_pack.xsYHPx/_new 2018-06-19 12:05:18.518367153 +0200 @@ -1,7 +1,7 @@ # # spec file for package acpid # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ Name: acpid -Version: 2.0.28 +Version: 2.0.29 Release: 0 Summary: Executes Actions at ACPI Events -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Daemons Url: http://sourceforge.net/projects/acpid2/ Source: http://downloads.sourceforge.net/project/acpid2/%{name}-%{version}.tar.xz ++++++ acpid-2.0.28.tar.xz -> acpid-2.0.29.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/Changelog new/acpid-2.0.29/Changelog --- old/acpid-2.0.28/Changelog 2016-09-15 21:58:08.747135430 +0200 +++ new/acpid-2.0.29/Changelog 2018-04-17 03:23:48.285350136 +0200 @@ -1,3 +1,15 @@ +* 2.0.29 2018-04-16 Ted Felix <[email protected]> + - 2.0.29 release + (configure.ac) (Ted Felix) + - Decouple -d and -f options. Bug #15. + (acpid.8 acpid.c acpid.h log.c log.h TESTPLAN) (Casper Ti. Vector) + - Rename acpid_debug -> debug_level. + (acpid.c event.c log.c log.h) (Ted Felix) + - Standards: man page command references. + (acpid.8 kacpimon/kacpimon.8) (Ted Felix) + - Log missing input layer as a warning. + (inotify_handler.c) (Ted Felix) + * 2.0.28 2016-09-15 Ted Felix <[email protected]> - 2.0.28 release (configure.ac) (Ted Felix) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/TESTPLAN new/acpid-2.0.29/TESTPLAN --- old/acpid-2.0.28/TESTPLAN 2015-07-29 01:20:13.072440075 +0200 +++ new/acpid-2.0.29/TESTPLAN 2018-03-29 17:02:02.915917661 +0200 @@ -25,7 +25,7 @@ sudo systemctl stop acpid acpid.socket - To make testing more convenient, you can run acpid from a shell as - "acpid -ld" to get maximum logging. Use Ctrl-C to stop acpid. + "acpid -fld" to get maximum logging. Use Ctrl-C to stop acpid. Normal Paths @@ -92,10 +92,10 @@ Run acpid with the -l option and make sure events are logged to syslog. * debug mode -Run acpid with the -d option and note that it runs in the foreground and +Run acpid with the -fd option and note that it runs in the foreground and provides debugging info to the console. acpid also supports up to 4 debug levels in the event handler. Might want -to try "-dddd" and see what happens. +to try "-fdddd" and see what happens. * foreground mode Run acpid with the -f option and note that it runs in the foreground. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/acpid.8 new/acpid-2.0.29/acpid.8 --- old/acpid-2.0.28/acpid.8 2014-08-22 15:12:22.029473237 +0200 +++ new/acpid-2.0.29/acpid.8 2018-03-29 17:42:27.702124397 +0200 @@ -21,9 +21,9 @@ \fIRules\fP are defined by simple configuration files. \fBacpid\fP will look in a configuration directory (\fI/etc/acpi/events\fP by default), and parse all regular files with names that consist entirely of upper and -lower case letters, digits, underscores, and hyphens (similar to -run-parts(8)). -.\" that do not begin with a period ('.') or end with a tilde (~). +lower case letters, digits, underscores, and hyphens (similar to +.BR run-parts (8)) +that do not begin with a period ('.') or end with a tilde (~). Each file must define two things: an \fIevent\fP and an \fIaction\fP. Any blank lines, or lines where the first character is a hash ('#') are ignored. Extraneous lines are flagged as warnings, but @@ -32,7 +32,9 @@ (but whitespace matters). The value can be up to 511 characters, and is case and whitespace sensitive. .PP -The event value is a regular expression (see regcomp(3)), against which events are matched. +The event value is a regular expression (see +.BR regcomp (3)), +against which events are matched. .PP The action value is a commandline, which will be invoked via \fI/bin/sh\fP whenever an event matching the rule in question occurs. The commandline may @@ -64,7 +66,8 @@ For faster startup, this socket can be passed in as stdin so that \fBacpid\fP need not create the socket. In addition, if a socket is passed in as stdin, \fBacpid\fP will not daemonize. It will be run in foreground. This behavior -is provided to support systemd(1). +is provided to support +.BR systemd (1). .PP .B acpid will log all of its activities, as well as the stdout and stderr of any @@ -82,9 +85,7 @@ can be made to the \fBacpid\fP socket. Default is \fI256\fP. .TP 12 .BI \-d "\fR, \fP" \-\-debug -This option increases the \fBacpid\fP debug level by one. If the debug level -is non-zero, \fBacpid\fP will run in the foreground, and will log to -stderr, in addition to the regular syslog. +This option increases the \fBacpid\fP debug level by one. .TP .BI \-e "\fR, \fP" \-\-eventfile " filename" This option changes the event file from which \fBacpid\fP reads events. @@ -94,7 +95,8 @@ This option forces \fBacpid\fP to use the Linux kernel input layer and netlink interface for ACPI events. .TP .BI \-f "\fR, \fP" \-\-foreground -This option keeps \fBacpid\fP in the foreground by not forking at startup. +This option keeps \fBacpid\fP in the foreground by not forking at startup, +and makes it log to stderr instead of syslog. .TP .BI \-l "\fR, \fP" \-\-logevents This option tells \fBacpid\fP to log information about all events and actions. @@ -171,13 +173,19 @@ .PP When troubleshooting \fBacpid\fP, it is important to be aware that other parts of a system might be handling ACPI events. -\fBsystemd\fP(1) is capable of handling the power switch and various other +.BR systemd (1) +is capable of handling the power switch and various other events that are commonly handled by \fBacpid\fP. See the description of -HandlePowerKey in \fBlogind.conf\fP(5) for more. Some window managers also +HandlePowerKey in +.BR logind.conf (5) +for more. Some window managers also take over \fBacpid\fP's normal handling of the power button and other events. .PP -kacpimon(8) can be used to verify that the expected ACPI events are -coming in. See the man page for kacpimon(8) for the proper procedure. +.BR kacpimon (8) +can be used to verify that the expected ACPI events are +coming in. See the man page for +.BR kacpimon (8) +for the proper procedure. If the events aren't coming in, you've probably got a kernel driver issue. .PP @@ -219,8 +227,14 @@ There are no known bugs. To file bug reports, see \fBPROJECT WEBSITE\fP below. .SH SEE ALSO -regcomp(3), sh(1), socket(2), connect(2), init(1), systemd(1), -acpi_listen(8), kacpimon(8) +.BR regcomp (3) +.BR sh (1) +.BR socket (2) +.BR connect (2) +.BR init (1) +.BR systemd (1) +.BR acpi_listen (8) +.BR kacpimon (8) .SH PROJECT WEBSITE http://sourceforge.net/projects/acpid2/ .SH AUTHORS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/acpid.c new/acpid-2.0.29/acpid.c --- old/acpid-2.0.28/acpid.c 2016-04-25 01:13:22.996715770 +0200 +++ new/acpid-2.0.29/acpid.c 2018-03-29 17:05:57.252312727 +0200 @@ -52,9 +52,6 @@ static void clean_exit(int sig); static void reload_conf(int sig); -/* global debug level */ -int acpid_debug; - /* do we log event info? */ int logevents; @@ -82,7 +79,10 @@ close_fds(); /* open the log */ - open_log(); + if (foreground) + log_to_stderr = 1; + else + open_log(); /* if we're running in the background, and we're not being started */ /* by systemd */ @@ -218,7 +218,7 @@ const char *opts_help[] = { "Set the configuration directory.", /* confdir */ "Set the limit on non-root socket connections.",/* clientmax */ - "Increase debugging level (implies -f).",/* debug */ + "Increase debugging level.",/* debug */ "Use the specified file for events.", /* eventfile */ "Run in the foreground.", /* foreground */ "Log all event activity.", /* logevents */ @@ -253,9 +253,7 @@ clientmax = strtol(optarg, NULL, 0); break; case 'd': - foreground = 1; - acpid_debug++; - log_debug_to_stderr = 1; + debug_level++; break; case 'e': eventfile = optarg; @@ -392,9 +390,6 @@ /* open the syslog */ log_opts = LOG_CONS|LOG_NDELAY; - if (acpid_debug) { - log_opts |= LOG_PERROR; - } openlog(PACKAGE, log_opts, LOG_DAEMON); } @@ -419,12 +414,12 @@ close(nullfd); return -1; } - if (!acpid_debug && dup2(nullfd, STDOUT_FILENO) != STDOUT_FILENO) { + if (!log_to_stderr && dup2(nullfd, STDOUT_FILENO) != STDOUT_FILENO) { acpid_log(LOG_ERR, "dup2() stdout: %s", strerror(errno)); close(nullfd); return -1; } - if (!acpid_debug && dup2(nullfd, STDERR_FILENO) != STDERR_FILENO) { + if (!log_to_stderr && dup2(nullfd, STDERR_FILENO) != STDERR_FILENO) { acpid_log(LOG_ERR, "dup2() stderr: %s", strerror(errno)); close(nullfd); return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/acpid.h new/acpid-2.0.29/acpid.h --- old/acpid-2.0.28/acpid.h 2014-02-26 01:36:58.788146100 +0100 +++ new/acpid-2.0.29/acpid.h 2018-04-11 01:51:39.467499913 +0200 @@ -42,7 +42,6 @@ /* * acpid.c */ -extern int acpid_debug; extern int logevents; extern const char *progname; extern int tpmutefix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/build-aux/config.guess new/acpid-2.0.29/build-aux/config.guess --- old/acpid-2.0.28/build-aux/config.guess 2016-09-15 21:59:53.692696753 +0200 +++ new/acpid-2.0.29/build-aux/config.guess 2018-04-17 03:25:44.702166019 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to <[email protected]>. @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -186,9 +186,12 @@ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -237,6 +240,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -268,42 +275,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -376,16 +383,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -410,7 +417,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -635,13 +642,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -680,11 +687,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -697,12 +704,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -807,14 +814,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -896,7 +903,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -919,7 +926,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -965,6 +972,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -990,6 +1000,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1022,6 +1035,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1120,7 +1136,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1269,6 +1285,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1282,9 +1301,9 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1306,7 +1325,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1337,7 +1356,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1379,7 +1398,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1390,23 +1409,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 <<EOF $0: unable to guess system type -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from +This script (version $timestamp), has failed to recognize the +operating system you are using. If your script is old, overwrite +config.guess and config.sub with the latest versions from: - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <[email protected]> in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to [email protected] to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/build-aux/config.sub new/acpid-2.0.29/build-aux/config.sub --- old/acpid-2.0.28/build-aux/config.sub 2016-09-15 21:59:53.696696736 +0200 +++ new/acpid-2.0.29/build-aux/config.sub 2018-04-17 03:25:44.705166014 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -118,7 +117,7 @@ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -302,6 +301,7 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -429,6 +429,7 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -521,7 +522,7 @@ basic_machine=i386-pc os=-aros ;; - asmjs) + asmjs) basic_machine=asmjs-unknown ;; aux) @@ -644,6 +645,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -1023,7 +1032,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1033,7 +1042,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1383,14 +1392,14 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1399,7 +1408,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1531,6 +1541,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/config.h new/acpid-2.0.29/config.h --- old/acpid-2.0.28/config.h 2016-09-15 22:00:03.008657812 +0200 +++ new/acpid-2.0.29/config.h 2018-04-17 03:25:55.259149321 +0200 @@ -136,7 +136,7 @@ #define PACKAGE_NAME "acpid" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "acpid 2.0.28" +#define PACKAGE_STRING "acpid 2.0.29" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "acpid" @@ -145,7 +145,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.0.28" +#define PACKAGE_VERSION "2.0.29" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -173,7 +173,7 @@ /* Version number of package */ -#define VERSION "2.0.28" +#define VERSION "2.0.29" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/configure new/acpid-2.0.29/configure --- old/acpid-2.0.28/configure 2016-09-15 21:59:52.529701614 +0200 +++ new/acpid-2.0.29/configure 2018-04-17 03:25:43.507167909 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for acpid 2.0.28. +# Generated by GNU Autoconf 2.69 for acpid 2.0.29. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='acpid' PACKAGE_TARNAME='acpid' -PACKAGE_VERSION='2.0.28' -PACKAGE_STRING='acpid 2.0.28' +PACKAGE_VERSION='2.0.29' +PACKAGE_STRING='acpid 2.0.29' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1287,7 +1287,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures acpid 2.0.28 to adapt to many kinds of systems. +\`configure' configures acpid 2.0.29 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1358,7 +1358,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of acpid 2.0.28:";; + short | recursive ) echo "Configuration of acpid 2.0.29:";; esac cat <<\_ACEOF @@ -1453,7 +1453,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -acpid configure 2.0.28 +acpid configure 2.0.29 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1872,7 +1872,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by acpid $as_me 2.0.28, which was +It was created by acpid $as_me 2.0.29, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2738,7 +2738,7 @@ # Define the identity of the package. PACKAGE='acpid' - VERSION='2.0.28' + VERSION='2.0.29' cat >>confdefs.h <<_ACEOF @@ -6193,7 +6193,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by acpid $as_me 2.0.28, which was +This file was extended by acpid $as_me 2.0.29, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6259,7 +6259,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -acpid config.status 2.0.28 +acpid config.status 2.0.29 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/configure.ac new/acpid-2.0.29/configure.ac --- old/acpid-2.0.28/configure.ac 2016-03-16 00:27:23.933828623 +0100 +++ new/acpid-2.0.29/configure.ac 2016-09-15 22:05:14.916354026 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([acpid], [2.0.28]) +AC_INIT([acpid], [2.0.29]) AC_CONFIG_SRCDIR([connection_list.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/event.c new/acpid-2.0.29/event.c --- old/acpid-2.0.28/event.c 2015-07-29 00:32:35.499948465 +0200 +++ new/acpid-2.0.29/event.c 2018-03-29 17:07:23.716843024 +0200 @@ -210,7 +210,7 @@ lock_rules(); - if (acpid_debug >= 3) { + if (debug_level >= 3) { acpid_log(LOG_DEBUG, "cleaning up rules"); } @@ -312,7 +312,7 @@ file, line); continue; } - if (acpid_debug >= 3) { + if (debug_level >= 3) { acpid_log(LOG_DEBUG, " key=\"%s\" val=\"%s\"", key, val); } @@ -595,7 +595,7 @@ p->type); } } else { - if (acpid_debug >= 3 && logevents) { + if (debug_level >= 3 && logevents) { acpid_log(LOG_INFO, "rule from %s did not match", p->origin); @@ -633,7 +633,7 @@ static void lock_rules(void) { - if (acpid_debug >= 4) { + if (debug_level >= 4) { acpid_log(LOG_DEBUG, "blocking signals for rule lock"); } sigprocmask(SIG_BLOCK, signals_handled(), NULL); @@ -642,7 +642,7 @@ static void unlock_rules(void) { - if (acpid_debug >= 4) { + if (debug_level >= 4) { acpid_log(LOG_DEBUG, "unblocking signals for rule lock"); } sigprocmask(SIG_UNBLOCK, signals_handled(), NULL); @@ -683,7 +683,7 @@ signal(SIGPIPE, SIG_DFL); sigprocmask(SIG_UNBLOCK, signals_handled(), NULL); - if (acpid_debug && logevents) { + if (debug_level && logevents) { fprintf(stdout, "BEGIN HANDLER MESSAGES\n"); } umask(0077); @@ -695,7 +695,7 @@ /* parent */ waitpid(pid, &status, 0); - if (acpid_debug && logevents) { + if (debug_level && logevents) { fprintf(stdout, "END HANDLER MESSAGES\n"); } @@ -769,7 +769,7 @@ } while (ttl < len && ntries); if (!ntries) { - if (acpid_debug >= 2) { + if (debug_level >= 2) { acpid_log(LOG_ERR, "safe_write() timed out"); } return r; @@ -806,7 +806,7 @@ } buf[i++] = *p++; } - if (acpid_debug >= 2) { + if (debug_level >= 2) { acpid_log(LOG_DEBUG, "expanded \"%s\" -> \"%s\"", cmd, buf); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/inotify_handler.c new/acpid-2.0.29/inotify_handler.c --- old/acpid-2.0.28/inotify_handler.c 2016-09-07 16:14:40.262181283 +0200 +++ new/acpid-2.0.29/inotify_handler.c 2018-03-29 21:53:31.224580468 +0200 @@ -139,8 +139,14 @@ wd = inotify_add_watch(fd, ACPID_INPUTLAYERDIR, IN_CREATE | IN_DELETE); if (wd < 0) { - acpid_log(LOG_ERR, "inotify_add_watch() failed: %s (%d)", - strerror(errno), errno); + if (errno == ENOENT) { + /* Common with headless devices. */ + acpid_log(LOG_WARNING, "inotify_add_watch(): input layer not found"); + } else { + acpid_log(LOG_ERR, "inotify_add_watch() failed: %s (%d)", + strerror(errno), errno); + } + close(fd); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/kacpimon/kacpimon.8 new/acpid-2.0.29/kacpimon/kacpimon.8 --- old/acpid-2.0.28/kacpimon/kacpimon.8 2013-01-27 05:36:30.939658957 +0100 +++ new/acpid-2.0.29/kacpimon/kacpimon.8 2018-03-29 17:51:24.690055096 +0200 @@ -19,11 +19,26 @@ Use \fBkacpimon\fP to make sure your kernel is sending acpi-related events via the three sources mentioned above. .PP -Since both \fBacpid\fP(8) and \fBkacpimon\fP connect to the same sources, be sure -to stop \fBacpid\fP(8) before running kacpimon. If you are using -\fBupstart\fP(7), use \fBinitctl\fP(8) to stop \fBacpid\fP(8). If you are using -\fBsystemd\fP(1), use \fBsystemctl\fP(1) to stop \fBacpid\fP(8). If you aren't -using either of those, you can try \fBkillall\fP(1) to stop \fBacpid\fP(8). +Since both +.BR acpid (8) +and \fBkacpimon\fP connect to the same sources, be sure to stop +.BR acpid (8) +before running kacpimon. If you are using +.BR upstart (7), +use +.BR initctl (8) +to stop +.BR acpid (8). +If you are using +.BR systemd (1), +use +.BR systemctl (1) +to stop +.BR acpid (8). +If you aren't using either of those, you can try +.BR killall (1) +to stop +.BR acpid (8). .PP Be sure to run \fBkacpimon\fP as root or else it won't be able to open /proc/acpi/event or the input layer: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/log.c new/acpid-2.0.29/log.c --- old/acpid-2.0.28/log.c 2011-10-18 00:52:32.420965575 +0200 +++ new/acpid-2.0.29/log.c 2018-03-29 17:08:05.842574608 +0200 @@ -26,7 +26,8 @@ #include "log.h" -int log_debug_to_stderr = 0; +int log_to_stderr = 0; +int debug_level = 0; int #ifdef __GNUC__ @@ -34,23 +35,17 @@ #endif acpid_log(int level, const char *fmt, ...) { + if (level == LOG_DEBUG && !debug_level) return 0; va_list args; + va_start(args, fmt); - if (level == LOG_DEBUG) { - /* if "-d" has been specified */ - if (log_debug_to_stderr) { - /* send debug output to stderr */ - va_start(args, fmt); - vfprintf(stderr, fmt, args); - va_end(args); - - fprintf(stderr, "\n"); - } + if (log_to_stderr) { + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); } else { - va_start(args, fmt); vsyslog(level, fmt, args); - va_end(args); } + va_end(args); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/acpid-2.0.28/log.h new/acpid-2.0.29/log.h --- old/acpid-2.0.28/log.h 2012-02-21 02:26:37.514721963 +0100 +++ new/acpid-2.0.29/log.h 2018-03-29 17:08:02.566518016 +0200 @@ -26,11 +26,11 @@ /* for LOG_ERR, LOG_DEBUG, LOG_INFO, etc... */ #include <syslog.h> -/* - * Set to 1 to send LOG_DEBUG logging to stderr, zero to ignore LOG_DEBUG - * logging. Default is zero. - */ -extern int log_debug_to_stderr; +/* Set to 1 to send logging to stderr. Default is zero. */ +extern int log_to_stderr; + +/* Global debug level. */ +extern int debug_level; extern int acpid_log(int level, const char *fmt, ...) __attribute__((format(printf,2,3)));
