Hello community, here is the log from the commit of package acpid for openSUSE:12.1:Update:Test checked in at 2012-01-05 16:50:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/acpid (Old) and /work/SRC/openSUSE:12.1:Update:Test/.acpid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "acpid", Maintainer is "[email protected]" Changes: -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /work/SRC/openSUSE:12.1:Update:Test/.acpid.new/acpid.changes 2012-01-05 16:50:09.000000000 +0100 @@ -0,0 +1,639 @@ +------------------------------------------------------------------- +Mon Sep 26 16:20:40 UTC 2011 - [email protected] + +- Use latest systemd RPM macros. + +------------------------------------------------------------------- +Fri Sep 23 14:18:54 UTC 2011 - [email protected] + +- Ensure acpid is enabled on initial install, under systemd + +------------------------------------------------------------------- +Sat Sep 17 10:46:41 UTC 2011 - [email protected] + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Wed Aug 24 16:30:58 UTC 2011 - [email protected] + +- Use systemd macros to enable acpid service. + +------------------------------------------------------------------- +Tue Aug 23 12:07:59 UTC 2011 - [email protected] + +- Remove _service file. + +------------------------------------------------------------------- +Tue Aug 23 02:54:40 UTC 2011 - [email protected] + +- Add the check for gnome-settings-daemon in power_button since + gnome-power-manager has been integrated into + gnome-settings-daemon. bnc#711148 + +------------------------------------------------------------------- +Sat May 21 16:09:14 UTC 2011 - [email protected] + +- Version update to 2.0.10 for systemd support + +------------------------------------------------------------------- +Wed Mar 9 13:07:22 UTC 2011 - [email protected] + +- update to 2.0.8: + - Fixed "comparison between signed and unsigned integer expressions" + error with gcc 4.6. (libnetlink.c) (Eugeni Dodonov) + - Fixed unused variable "type" with gcc 4.6. (libnetlink.c) (Jiri Skala) + +------------------------------------------------------------------- +Wed Dec 22 03:36:31 UTC 2010 - [email protected] + +- 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 - [email protected] + +- fix systemd service file (acpid is in /sbin, not /usr/sbin) + +------------------------------------------------------------------- +Tue Nov 9 15:42:19 UTC 2010 - [email protected] + +- use full RELRO here. + +------------------------------------------------------------------- +Tue Oct 12 18:51:58 UTC 2010 - [email protected] + +- fix logic + +------------------------------------------------------------------- +Tue Oct 12 15:28:20 UTC 2010 - [email protected] + +- Do not warn on "skipping .. and ." directory entries + +------------------------------------------------------------------- +Sat Oct 2 19:49:08 UTC 2010 - [email protected] + +- Add systemd configuration. +- Always fork, even if called from PID 1. + +------------------------------------------------------------------- +Sat Oct 2 19:27:50 UTC 2010 - [email protected] + +- Update to version 2.0.6: + * cleanup of code and build infrastructure + * Support netlink and input layer + +------------------------------------------------------------------- +Sat Oct 2 19:26:45 UTC 2010 - [email protected] + +- Split up acpi in its own package. + +------------------------------------------------------------------- +Wed Sep 2 17:58:25 CEST 2009 - [email protected] + +- Don't shutdown if dalston-power-applet is running. + +------------------------------------------------------------------- +Sun Aug 30 11:56:59 UTC 2009 - [email protected] + +- Remove enable from hotkey setting for think_acpi to get rid of this + kernel message: + "Please remove the hotkey=enable module parameter, it is deprecated. + Hotkeys are always enabled." + +------------------------------------------------------------------- +Thu Jul 9 15:17:58 CEST 2009 - [email protected] + +- remove obsolete cruft from acpid init script +- fix syntax error in "rcacpid probe" (bnc#508574) + +------------------------------------------------------------------- +Wed Apr 22 20:57:52 CEST 2009 - [email protected] + +- update to version 1.0.10 + - Add a -C (--clientmax) command line flag to set max number of + non-root socket connections. + - Set the maximum number of socket clients to 256 by default. + - Close clients that have disconnected. + - Give up and exit() if 5 accept() calls fail in a row. + - Open /dev/null O_RDWR, rather than O_RDONLY. +- this fixes bnc#491455 + +------------------------------------------------------------------- +Wed Apr 15 14:35:11 CEST 2009 - [email protected] + +- fix boot warning about /etc/modprobe.d/thinkpad_acpi + +------------------------------------------------------------------- +Mon Mar 9 21:00:17 CET 2009 - [email protected] + +- renamed modprobe config to /etc/modprobe.d/50-thinkpad_acpi.conf + (required by new module-init-tools). + +------------------------------------------------------------------- + +Wed Feb 4 21:10:28 CET 2009 - [email protected] + +- update to version 1.0.8: + - various code cleanups, enable stricter compiler warnings + - fix typos in man pages. (acpid.8, acpi_listen.8) + - stop processing ACPI events when a lockfile exists (see acpid.8) + - add -l (--logevents) option to enable logging of all events. + Due to a number of reports of log flooding (bad ACPI BIOS?), the + new default is to NOT log events + - add pidfile support and a -p (--pidfile) option to change it + - close client file descriptors on exec() + - fix a fd leak on error + +------------------------------------------------------------------- +Mon Jan 26 11:53:42 CET 2009 - [email protected] + +- change fillup call from "-Y" to "-y" the boot script has + been present in this package for long enough (SLES10-GA) + +------------------------------------------------------------------- +Sun Nov 16 13:31:51 CET 2008 - [email protected] + +- Don't shutdown if a kde4 session is running and the power button + is pressed, powerdevil will care (bnc#443210) + +------------------------------------------------------------------- +Thu Oct 16 14:44:39 CEST 2008 - [email protected] + +- Fix documentation reference and vendor names in thinkpad_acpi + (bnc#410684) + +------------------------------------------------------------------- +Wed Oct 15 18:51:22 CEST 2008 - [email protected] + +- fix syntax error in acpid init script (bnc#435503) + +------------------------------------------------------------------- +Mon Sep 1 18:37:13 CEST 2008 - [email protected] + +- different config files for different rules: + events.thinkpad and events.power_button + +------------------------------------------------------------------- +Thu Aug 7 23:03:40 CEST 2008 - [email protected] + +- add power_button script to care about button presses if there + is no active X session + +------------------------------------------------------------------- +Sun Jun 8 18:01:52 CEST 2008 - [email protected] + +- minor fixes to the thinkpad_handler script (bnc#371927) + +------------------------------------------------------------------- +Fri Jun 6 12:34:11 CEST 2008 - [email protected] + +- add script for enabling/disabling bluetooth via hotkey on ++++ 442 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update:Test/.acpid.new/acpid.changes New: ---- README.SuSE _link acpid-2.0.10.tar.gz acpid-makefile.patch acpid.changes acpid.service acpid.spec events.power_button events.thinkpad power_button rcacpid thinkpad_acpi.modprobe thinkpad_handler ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpid.spec ++++++ # # spec file for package acpid # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: acpid Url: http://tedfelix.com/linux/acpid-netlink.html Version: 2.0.10 Release: 5 License: GPLv2+ Group: System/Daemons PreReq: %insserv_prereq %fillup_prereq Summary: Executes Actions at ACPI Events Source: http://tedfelix.com//linux/%{name}-%{version}.tar.gz Source2: rcacpid Source3: README.SuSE Source4: thinkpad_acpi.modprobe Source5: events.power_button Source9: events.thinkpad Source6: thinkpad_handler Source7: power_button Source8: acpid.service Patch1: acpid-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: systemd ExclusiveArch: %ix86 x86_64 ia64 %systemd_requires %description ACPID is a completely flexible, totally extensible daemon for delivering ACPI events. It listens to a file (/proc/acpi/event) and, when an event occurs, executes programs to handle the event. The start script loads all needed modules. Configure it in /etc/sysconfig/powermanagement. %prep %setup -q %patch1 -p0 cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} . %build export LDFLAGS="-Wl,-z,relro,-z,now" make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=/sbin install -Dm 744 rcacpid %{buildroot}/etc/init.d/acpid install -Dm 644 thinkpad_acpi.modprobe %{buildroot}/etc/modprobe.d/50-thinkpad_acpi.conf install -Dm 744 thinkpad_handler %{buildroot}/usr/lib/acpid/thinkpad_handler install -Dm 744 power_button %{buildroot}/usr/lib/acpid/power_button mkdir -p %{buildroot}/usr/sbin ln -sf ../../etc/init.d/acpid %{buildroot}/usr/sbin/rcacpid install -Dm 644 events.power_button %{buildroot}/etc/acpi/events/power_button install -Dm 644 events.thinkpad %{buildroot}/etc/acpi/events/thinkpad mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_unitdir} # for the rpmlint fascists mv samples examples # keep the logfile install -dm 755 %buildroot%_var/log touch %buildroot%_var/log/acpid %pre %service_add_pre acpid.service %post %{fillup_and_insserv -y -f acpid} %service_add_post acpid.service %postun %restart_on_update acpid %{insserv_cleanup} %service_del_postun acpid.service %preun %stop_on_removal acpid %service_del_preun acpid.service %files %defattr(-,root,root) %dir /etc/modprobe.d %dir /etc/acpi %dir /etc/acpi/events /etc/acpi/events/thinkpad /etc/acpi/events/power_button /usr/lib/acpid /etc/init.d/acpid /etc/modprobe.d/50-thinkpad_acpi.conf %_unitdir/%{name}.service /usr/sbin/rcacpid /sbin/acpid /usr/bin/acpi_listen %doc README.SuSE README Changelog examples /usr/share/man/man8/acpid.8.gz /usr/share/man/man8/acpi_listen.8.gz %ghost %config(noreplace,missingok) %_var/log/acpid %changelog ++++++ README.SuSE ++++++ Dokumentation for acpid can be found in 'man acpid'. Be aware that the acpid is only used to hand over ACPI events (caught from /proc/acpi/events) to other services (e.g. hal, powersaved, iald, ...). The events are handled by those services. Most of them are processed by the powersave daemon. For further documentation, please have a look at: /usr/share/doc/packages/powersave/ or http://powersave.sourceforge.net/ ++++++ _link ++++++ <link project="openSUSE:12.1" package="acpid" baserev="c16997e0d3141d1c0f718bba3482ed26"> <patches> <branch/> </patches> </link> ++++++ acpid-makefile.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig +++ Makefile @@ -49,7 +49,7 @@ install_docs: for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done cp -a samples $(DESTDIR)/$(DOCDIR) -install: $(PROGS) man install_docs +install: $(PROGS) man mkdir -p $(DESTDIR)/$(SBINDIR) mkdir -p $(DESTDIR)/$(BINDIR) install -m 0750 acpid $(DESTDIR)/$(SBINDIR) ++++++ acpid.service ++++++ [Unit] Description=ACPI Event Daemon After=syslog.target # This could probably benefit from socket activation, but honestly I think it # is time for acpid to go away, and hence I am not planning to spend the time # to add socket activation here. We use Type=forking to ensure that the # communication sockets are in place before boot proceeds with any service # needing this service. Would acpid support socket activation we could use # Type=simple here. [Service] Type=forking ExecStart=/sbin/acpid [Install] WantedBy=multi-user.target ++++++ events.power_button ++++++ # care about the power button event=button/power.* action=/usr/lib/acpid/power_button ++++++ events.thinkpad ++++++ # forward acpi events to the thinkpad handler (bluetooth etc.) event=ibm/.* action=/usr/lib/acpid/thinkpad_handler "%e" ++++++ power_button ++++++ #!/bin/bash # # check if a X session is running and active. # If not, shut down the system # # Copyright (C) 2008 Holger Macht <[email protected]> # # This file is released under the GPLv2. # EXEC="/sbin/shutdown -h now" # check if we have pm-profiler and an active profile. If so, $EXEC can be # overwritten by the active profile's configuration . /etc/pm-profiler.conf > /dev/null 2>&1 if [ "$?" = "0" ]; then . /etc/pm-profiler/$PM_PROFILER_PROFILE/config >/dev/null 2>&1 fi [ -z "$POWER_BUTTON_HOOK" ] || EXEC="$POWER_BUTTON_HOOK" # iterate over all sessions. If a active X session is found, do nothing while read A; do SESSION=`echo $A | sed 's/\(Session[0-9]*\)://g'` [ -z "$SESSION" ] || continue SESSION=`echo $A | sed 's/\(Session[0-9]*\):/\1/g'` IS_X=`dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit \ /org/freedesktop/ConsoleKit/$SESSION \ org.freedesktop.ConsoleKit.Session.GetX11Display` # check if this is a X session, if not, go on DISP=`echo $IS_X | sed -e 's/^.* string "\(.*\)"/\1/'` [ -n "$DISP" ] || continue IS_ACTIVE=`dbus-send --system --print-reply --dest=org.freedesktop.ConsoleKit \ /org/freedesktop/ConsoleKit/$SESSION \ org.freedesktop.ConsoleKit.Session.IsActive` IS_ACTIVE=`echo $IS_ACTIVE | sed -e 's/^.* boolean \(.*\)$/\1/'` # debug #if [ "$IS_ACTIVE" = "true" ]; then # echo "and is active" #else # echo "and is not active" #fi if [ "$IS_ACTIVE" = "true" -a -n "$DISP" ]; then # additional check, if none of these two apps are running, go on if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof kded4`" -o -n "`pidof dalston-power-applet`" -o -n "`pidof gnome-settings-daemon`" ]; then echo doing nothing... exit 0 fi fi done < <(ck-list-sessions) logger -s -t pm-profiler "Power Button pressed, executing $EXEC" $EXEC ++++++ rcacpid ++++++ #! /bin/bash # Copyright (c) 2002-2010 SUSE Linux Products GmbH, Nuernberg, Germany. # All rights reserved. # # Authors: Christian Zoz <[email protected]> # Timo Hoenig <[email protected]> # Stefan Seyfried <[email protected]> # # /etc/init.d/acpid # and its symbolic link # /usr/sbin/rcacpid # # LSB compliant service control script; see http://www.linuxbase.org/spec/ # ### BEGIN INIT INFO # Provides: acpid # Required-Start: $local_fs # Required-Stop: $null # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Listen and dispatch ACPI events from the kernel # Description: acpid reads events from /proc/acpi/event and dispatches # them (by SuSE default) to other "users" like powersaved, HAL and IAL. # Actions for those events are (by SUSE default) configured in the # powersaved configuration. # Additionally this start script loads all needed modules. ### END INIT INFO # Check for missing binaries (stale symlinks should not happen) ACPID_BIN=/sbin/acpid test -x $ACPID_BIN || exit 5 # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks # rc_splash arg sets the boot splash screen to arg (if active) . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) if [ ! -d /proc/acpi ] ; then echo -n "acpid: no ACPI support in kernel" rc_status -s rc_exit fi echo -n "Starting acpid " startproc $ACPID_BIN rc_status -v ;; stop) echo -n "Shutting down acpid " killproc -TERM $ACPID_BIN rc_status -v ;; try-restart) $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload|reload) echo -n "Reload service acpid " killproc -HUP $ACPID_BIN rc_status -v ;; status) echo -n "Checking for service acpid " PID=`checkproc -v $ACPID_BIN` if rc_status ; then case `cat /proc/$PID/cmdline` in *events.ignore) rc_failed 3 ;; esac fi rc_status -v ;; probe) for i in /etc/acpi/events/*; do test $i -nt /var/run/acpid.pid && echo restart && break done ;; *) echo "Usage: $0" \ "{start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ thinkpad_acpi.modprobe ++++++ # # IBM/Lenovo ThinkPad ACPI driver options # # A detailed description of the parameters for the ThinkPad ACPI driver can be found # in /usr/src/linux/Documentation/laptops/thinkpad-acpi.txt which is part of the package # 'kernel-source'. # # If you encounter problems with the hotkey mask please file a bug on # http://bugzilla.novell.com/ # options thinkpad_acpi experimental=1 hotkey=0xffffff ++++++ thinkpad_handler ++++++ #!/bin/bash HOTKEY=$1 set $HOTKEY EVENT=$1 # "ibm/hotkey" ACPI=$2 # "HOTK" WHAT=$3 # "00000080" SERIAL=$4 # "0000100c" Fn+F12 # bluetooth if [ "$WHAT" = "00000080" -a "$SERIAL" = "00001005" ]; then ACTION="disable" grep -q "disabled" "/proc/acpi/ibm/bluetooth" && ACTION="enable" echo $ACTION > "/proc/acpi/ibm/bluetooth" fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
