diff --git a/.acpid.metadata b/.acpid.metadata new file mode 100644 index 0000000..26c25b5 --- /dev/null +++ b/.acpid.metadata @@ -0,0 +1 @@ +ef37c91ed938b17a91aa081fa115a528f6161201 SOURCES/acpid-2.0.19.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/acpid.init b/SOURCES/acpid.init new file mode 100755 index 0000000..0ddab7a --- /dev/null +++ b/SOURCES/acpid.init @@ -0,0 +1,115 @@ +#!/bin/bash +# +# /etc/rc.d/init.d/acpid +# +# Starts the acpi daemon +# +# chkconfig: 345 26 74 +# description: Listen and dispatch ACPI events from the kernel +# processname: acpid + +### BEGIN INIT INFO +# Provides: acpid +# Required-Start: $syslog $local_fs +# Required-Stop: $syslog $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start and stop acpid +# Description: Listen and dispatch ACPI events from the kernel +### END INIT INFO + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/acpid + +RETVAL=0 + +# +# See how we were called. +# + +check() { + # Check that we're a privileged user + [ `id -u` = 0 ] || exit 4 + + # Check if acpid is executable + test -x /usr/sbin/acpid || exit 5 +} + +start() { + + check + + # Check if it is already running + if [ ! -f /var/lock/subsys/acpid ]; then + echo -n $"Starting acpi daemon: " + daemon /usr/sbin/acpid $OPTIONS + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid + echo + fi + return $RETVAL +} + +stop() { + + check + + echo -n $"Stopping acpi daemon: " + killproc /usr/sbin/acpid + RETVAL=$? + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/acpid + echo + return $RETVAL +} + + +restart() { + stop + start +} + +reload() { + + check + + trap "" SIGHUP + action $"Reloading acpi daemon:" killall -HUP acpid + RETVAL=$? + return $RETVAL +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +reload) + reload + ;; +force-reload) + echo "$0: Unimplemented feature." + RETVAL=3 + ;; +restart) + restart + ;; +condrestart) + if [ -f /var/lock/subsys/acpid ]; then + restart + fi + ;; +status) + status acpid + RETVAL=$? + ;; +*) + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" + RETVAL=2 +esac + +exit $RETVAL diff --git a/SOURCES/acpid.power.conf b/SOURCES/acpid.power.conf new file mode 100644 index 0000000..b654aa3 --- /dev/null +++ b/SOURCES/acpid.power.conf @@ -0,0 +1,5 @@ +# ACPID config to power down machine if powerbutton is pressed, but only if +# no gnome-power-manager is running + +event=button/power.* +action=/etc/acpi/actions/power.sh diff --git a/SOURCES/acpid.power.sh b/SOURCES/acpid.power.sh new file mode 100644 index 0000000..97a5fbc --- /dev/null +++ b/SOURCES/acpid.power.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/bin + +# Check session status using systemd +session_ids=$(systemd-loginctl list-sessions 2>/dev/null | awk '{print $1}') +for session in ${session_ids} ; do + session_status=$(systemd-loginctl session-status ${session}) + echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|kded4\|xfce4-power-manager\)' &> /dev/null && exit 0 +done + +# Get the ID of the first active X11 session: using ConsoleKit +uid_session=$( +ck-list-sessions 2>/dev/null | \ +awk ' +/^Session[0-9]+:$/ { uid = active = x11 = "" ; next } +{ gsub(/'\''/, "", $3) } +$1 == "unix-user" { uid = $3 } +$1 == "active" { active = $3 } +$1 == "x11-display" { x11 = $3 } +active == "TRUE" && x11 != "" { + print uid + exit +}') + +# Check that there is a power manager, otherwise shut down. +[ "$uid_session" ] && +ps axo uid,cmd | \ +awk ' + $1 == '$uid_session' && + ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || + $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || + $2 ~ /kded4/ || $3 ~ /guidance-power-manager/) \ + { found = 1; exit } + END { exit !found } +' || + shutdown -h now + diff --git a/SOURCES/acpid.service b/SOURCES/acpid.service new file mode 100644 index 0000000..553b3e2 --- /dev/null +++ b/SOURCES/acpid.service @@ -0,0 +1,18 @@ +[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 +EnvironmentFile=/etc/sysconfig/acpid +ExecStart=/usr/sbin/acpid $OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/SOURCES/acpid.sysconfig b/SOURCES/acpid.sysconfig new file mode 100644 index 0000000..f0d2bfb --- /dev/null +++ b/SOURCES/acpid.sysconfig @@ -0,0 +1 @@ +OPTIONS= diff --git a/SOURCES/acpid.video.conf b/SOURCES/acpid.video.conf new file mode 100644 index 0000000..97507bf --- /dev/null +++ b/SOURCES/acpid.video.conf @@ -0,0 +1,6 @@ +# Configuration to turn on DPMS again on video activity, needed for some +# laptops. Disabled by default, uncomment if your laptop display stays blank +# after you close and open the lid. + +#event=video.* +#action=/usr/sbin/vbetool dpms on diff --git a/SPECS/acpid.spec b/SPECS/acpid.spec new file mode 100644 index 0000000..fc24d09 --- /dev/null +++ b/SPECS/acpid.spec @@ -0,0 +1,385 @@ +Summary: ACPI Event Daemon +Name: acpid +Version: 2.0.19 +Release: 1%{?dist} +License: GPLv2+ +Group: System Environment/Daemons +Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz +Source1: acpid.init +Source2: acpid.video.conf +Source3: acpid.power.conf +Source4: acpid.power.sh +Source5: acpid.service +Source6: acpid.sysconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: ia64 x86_64 %{ix86} +URL: http://sourceforge.net/projects/acpid2/ +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires: systemd + + +%description +acpid is a daemon that dispatches ACPI events to user-space programs. + +%package sysvinit +Summary: ACPI Event Daemon +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} +Requires(preun): /sbin/service + +%description sysvinit +The acpid-sysvinit contains SysV initscript. + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot} +make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} + +mkdir -p %{buildroot}%{_sysconfdir}/acpi/events +mkdir -p %{buildroot}%{_sysconfdir}/acpi/actions +mkdir -p %{buildroot}/lib/systemd/system +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig + +chmod 755 %{buildroot}%{_sysconfdir}/acpi/events +install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/acpi/events/videoconf +install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/acpi/events/powerconf +install -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh +install -m 644 %{SOURCE5} %{buildroot}/lib/systemd/system +install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid + +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root) +%doc %{_docdir}/%{name}-%{version} +/lib/systemd/system/%{name}.service +%dir %{_sysconfdir}/acpi +%dir %{_sysconfdir}/acpi/events +%dir %{_sysconfdir}/acpi/actions +%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/videoconf +%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/powerconf +%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/acpi/actions/power.sh +%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/acpid +%{_bindir}/acpi_listen +%{_sbindir}/acpid +%{_sbindir}/kacpimon +%{_mandir}/man8/acpid.8.gz +%{_mandir}/man8/acpi_listen.8.gz +%{_mandir}/man8/kacpimon.8.gz + +%files sysvinit +%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid + +%pre +if [ "$1" = "2" ]; then + conflist=`ls %{_sysconfdir}/acpi/events/*.conf 2> /dev/null` + RETCODE=$? + if [ $RETCODE -eq 0 ]; then + for i in $conflist; do + rmdot=`echo $i | sed 's/.conf/conf/'` + mv $i $rmdot + done + fi +fi + +%post +%systemd_post %{name}.service + +%preun +%systemd_preun %{name}.service + +%postun +%systemd_postun_with_restart %{name}.service + +%triggerun -- %{name} < 2.0.10-2 + /sbin/chkconfig --del acpid >/dev/null 2>&1 || : + /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : + +%triggerpostun -n %{name}-sysvinit -- %{name} < 2.0.10-2 + /sbin/chkconfig --add acpid >/dev/null 2>&1 || : + + +%changelog +* Tue May 28 2013 Jaroslav Škarvada - 2.0.19-1 +- New version + +* Mon Feb 25 2013 Jaroslav Škarvada - 2.0.18-3 +- Switched to systemd-rpm macros + Resolves: rhbz#850020 + +* Fri Feb 15 2013 Jaroslav Škarvada - 2.0.18-2 +- Fixed source URL + +* Fri Feb 15 2013 Jaroslav Škarvada - 2.0.18-1 +- New version +- Replaced RPM_BUILD_ROOT variables by {buildroot} macros +- Updated URLs to project home page and source code +- Dropped mk patch, handled better way in the spec + +* Wed Feb 13 2013 Fedora Release Engineering - 2.0.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 17 2012 Jaroslav Škarvada - 2.0.17-1 +- New version + Resolves: rhbz#857695 + +* Wed Jul 18 2012 Fedora Release Engineering - 2.0.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 9 2012 Jaroslav Škarvada - 2.0.16-4 +- Update of power.sh to be compatible with new systemd-loginctl + Resolves: rhbz#819547 + +* Thu Jun 14 2012 Jaroslav Škarvada - 2.0.16-3 +- Silenced possible ck-list-sessions errors in power.sh + +* Thu Jun 14 2012 Jaroslav Škarvada - 2.0.16-2 +- Added support for systemd-loginctl list-sessions + Resolves: rhbz#819559 + +* Thu Mar 29 2012 Jaroslav Škarvada - 2.0.16-1 +- New version + +* Fri Mar 16 2012 Jiri Skala - 2.0.15-1 +- updated to latest upstream 2.0.15 + +* Thu Jan 12 2012 Fedora Release Engineering - 2.0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jan 02 2012 Jiri Skala - 2.0.14-2 +- fixes #722325 - xfce4-power-manager does not seem to be supported + +* Mon Dec 19 2011 Jiri Skala - 2.0.14-1 +- updated to latest upstream 2.0.14 + +* Wed Nov 16 2011 Jiri Skala - 2.0.13-1 +- updated to latest upstream 2.0.13 + +* Tue Aug 16 2011 Jiri Skala - 2.0.12-1 +- updated to latest upstream 2.0.12 + +* Mon Aug 01 2011 Jiri Skala - 2.0.11-1 +- updated to latest upstream 2.0.11 + +* Mon Jun 27 2011 Jiri Skala - 2.0.10-2 +- fixes #716923 - move SysV initscript file into an optional subpackage + +* Wed May 18 2011 Jiri Skala - 2.0.10-1 +- update to latest upstream 2.0.10 + +* Fri May 06 2011 Bill Nottingham - 2.0.9-4 +- fix systemd scriptlets to properly handle upgrade + +* Tue May 03 2011 Jiri Skala - 2.0.9-3 +- corrected relase number to be min equal to f15 + +* Mon Apr 18 2011 Jiri Skala - 2.0.9-1 +- update to latest upstream 2.0.9 + +* Wed Feb 16 2011 Jiri Skala - 2.0.8-1 +- update to latest upstream 2.0.8 + +* Wed Feb 09 2011 Jiri Skala - 2.0.7-3 +- fixes unused varable and coparison of different var types + +* Mon Feb 07 2011 Fedora Release Engineering - 2.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 08 2010 Jiri Skala - 2.0.7-1 +- update to latest upstream +- fixes #660459 - Should be able to set options with /etc/sysconfig/acpi + +* Wed Nov 03 2010 Jiri Skala - 2.0.5-5 +- fixes #648221 - SELinux is preventing /sbin/iwconfig access to a leaked /dev/input/event0 file descriptor + +* Wed Sep 29 2010 jkeating - 2.0.5-4 +- Rebuilt for gcc bug 634757 + +* Mon Sep 13 2010 Jiri Skala - 2.0.5-3 +- fixes #629740 - acpid doesn't fork, but systemd unit file claims otherwise + +* Wed Aug 11 2010 Jiri Skala - 2.0.5-2 +- fixes #617317 - Providing native systemd file for upcoming F14 Feature Systemd + +* Tue Jul 13 2010 Jiri Skala - 2.0.5-1 +- latest upstream version +- fixes #613315 kernel-2.6.35 doesn't create /proc/acpi/event + +* Wed May 05 2010 Jiri Skala - 2.0.4-1 +- latest upstream version + +* Wed Mar 17 2010 Jiri Skala - 2.0.3-2 +- fixes #575320 - acpid fails to load any event config files + +* Thu Feb 25 2010 Jiri Skala - 2.0.2-1 +- latest upstream version +- removed spare umask +- fixes missing headers + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Apr 23 2009 Zdenek Prikryl - 1.0.10-1 +- Updated to version 1.0.10 + +* Mon Feb 23 2009 Fedora Release Engineering - 1.0.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 04 2009 Zdenek Prikryl - 1.0.8-2 +- power.sh works with KDE 4.* (#483417) + +* Tue Nov 11 2008 Zdenek Prikryl - 1.0.8-1 +- Updated to version 1.0.8 +- power.sh works with ConsoleKit >= 0.3.0 (#470752) +- Fixed conditions in power.sh, which look for power-managers (#470752) +- Added check to init script + +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0.6-8 +- fix license tag + +* Thu Apr 17 2008 Bill Nottingham - 1.0.6-7.fc9 +- adjust start/stop priority to not conflict with HAL (#442759) + +* Thu Feb 14 2008 Zdenek Prikryl - 1.0.6-6.fc9 +- Update of acpid-1.0.6-makefile.patch, it fix building with gcc 4.3 + +* Wed Jan 23 2008 Zdenek Prikryl - 1.0.6-5.fc9 +- Fixed managing of power button (#361501) +- Fixed power script to check for KDE power manager (#419331) + +* Fri Nov 23 2007 Zdenek Prikryl - 1.0.6-4.fc9 +- Removed old logrotate file +- Fixed socket leak (#394431) +- Fixed dumping useless info to log (#389581) + +* Thu Oct 23 2007 Zdenek Prikryl - 1.0.6-3.fc9 +- Silent initscript +- Resolves: #345611 + +* Wed Sep 26 2007 Zdenek Prikryl - 1.0.6-2.fc8 +- Fixed leak of a file descriptor +- Resolves: #304761 + +* Tue Aug 07 2007 Zdenek Prikryl - 1.0.6-1.fc8 +- Updated to version 1.0.6 + +* Wed Jul 25 2007 Zdenek Prikryl - 1.0.4-8.fc8 +- Fixed init script to comply with LSB standard +- Resolves: #237754 + +* Wed Feb 14 2007 Phil Knirsch - 1.0.4-7.fc7 +- Dropped /var/log/acpid ownership as per review (225237) + +* Wed Feb 07 2007 Phil Knirsch - 1.0.4-6.fc7 +- Tons of specfile changes due to review (#225237) + +* Tue Oct 10 2006 Phil Knirsch - 1.0.4-5 +- Made acpid a PIE binary (#210016) + +* Thu Aug 24 2006 Phil Knirsch - 1.0.4-4 +- Made a better fix for the powerdown button which checks if g-p-m is running +- Don't install sample.conf anymore, not needed + +* Thu Aug 10 2006 Phil Knirsch - 1.0.4-3 +- Disable the automatic shutdown -h via powerdown button by default due to + conflicts with gnome-power-manager + +* Wed Jul 12 2006 Jesse Keating - 1.0.4-2.1 +- rebuild + +* Wed Mar 01 2006 Phil Knirsch - 1.0.4-2 +- Added video.conf file to turn on DPMS when opening the laptop lid. Disabled + by default. + +* Tue Feb 07 2006 Jesse Keating - 1.0.4-1.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Mar 16 2005 Bill Nottingham - 1.0.4-1 +- update to 1.0.4 + +* Mon Aug 9 2004 Miloslav Trmac - 1.0.3-2 +- Update to 1.0.3 (fixes #128834) +- s/Copyright/License/ +- Add logrotate config file (#110677, from Michal Jaegermann) +- Don't verify contents of /var/log/acpid (#125862) +- Use $RPM_OPT_FLAGS +- Fix and cleanup acpid-1.0.1-pm1.patch +- Add condrestart to %%postun + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Oct 22 2003 Bill Nottingham 1.0.2-5 +- fix handling of sample.conf (#107160) +- mark for translations (#107459) + +* Sun Oct 19 2003 Florian La Roche +- add %%clean specfile target + +* Wed Oct 1 2003 Bill Nottingham 1.0.2-3 +- re-enable x86 +- don't load the button module + +* Thu Aug 7 2003 Bill Nottingham 1.0.2-2 +- no x86 for now + +* Mon Jul 7 2003 Bill Nottingham 1.0.2-1 +- update to 1.0.2 + +* Wed Dec 11 2002 Bill Nottingham 1.0.1-4 +- don't start if /proc/acpi/event isn't there + +* Thu Nov 14 2002 Bill Nottingham 1.0.1-3 +- build on more arches + +* Mon Aug 26 2002 Bill Nottingham 1.0.1-2 +- tweak default config to run shutdown -h now on a power button event + +* Thu Aug 22 2002 Bill Nottingham 1.0.1-1 +- initial build, bang on included specfile + +* Fri Mar 15 2002 Tim Hockin + - Updated RPM spec with patch from sun for chkconfig on/off + - Add Changelog, make 'make rpm' use it. + +* Wed Mar 13 2002 Tim Hockin + - Fixed logging bug - not appending to log (O_APPEND needed) + - Fix 'make install' to not need root access + - Fix RPM spec to not need root + +* Thu Sep 6 2001 Tim Hockin + - 1.0.0 + +* Thu Aug 16 2001 Tim Hockin + - Added commandline options to actions + +* Wed Aug 15 2001 Tim Hockin + - Added UNIX domain socket support + - Changed /etc/acpid.d to /etc/acpid/events + +* Mon Aug 13 2001 Tim Hockin + - added changelog + - 0.99.1-1 +