From 6be01b2c1aaf338510ffde45ab49441def20e347 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Fri, 11 Feb 2011 07:46:06 +0100 Subject: [PATCH 001/111] - fixes unused varable and coparison of different var types --- acpid-2.0.7-unused.patch | 29 +++++++++++++++++++++++++++++ acpid.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 acpid-2.0.7-unused.patch diff --git a/acpid-2.0.7-unused.patch b/acpid-2.0.7-unused.patch new file mode 100644 index 0000000..3d7e7d3 --- /dev/null +++ b/acpid-2.0.7-unused.patch @@ -0,0 +1,29 @@ +diff -up acpid-2.0.7/libnetlink.c.unused acpid-2.0.7/libnetlink.c +--- acpid-2.0.7/libnetlink.c.unused 2011-02-09 16:57:55.922298993 +0100 ++++ acpid-2.0.7/libnetlink.c 2011-02-09 16:59:02.927298890 +0100 +@@ -441,7 +441,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt + nladdr.nl_groups = 0; + + while (1) { +- int err, len, type; ++ int err, len; + int l; + + status = fread(&buf, 1, sizeof(*h), rtnl); +@@ -456,7 +456,6 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt + return 0; + + len = h->nlmsg_len; +- type= h->nlmsg_type; + l = len - sizeof(*h); + + if (l<0 || (unsigned)len>sizeof(buf)) { +@@ -518,7 +517,7 @@ int addattr_l(struct nlmsghdr *n, int ma + + int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len) + { +- if ((int)NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) { ++ if ((int)NLMSG_ALIGN(n->nlmsg_len) + (int)NLMSG_ALIGN(len) > maxlen) { + fprintf(stderr, "addraw_l ERROR: message exceeded bound of %d\n",maxlen); + return -1; + } diff --git a/acpid.spec b/acpid.spec index 7a1f606..7e981e7 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -13,6 +13,7 @@ Source5: acpid.service Source6: acpid.sysconfig Patch1: acpid-2.0.2-makefile.patch +Patch2: acpid-2.0.7-unused.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} @@ -31,6 +32,7 @@ acpid is a daemon that dispatches ACPI events to user-space programs. %setup -q %patch1 -p1 -b .makefile +%patch2 -p1 -b .unused %build make %{?_smp_mflags} @@ -116,6 +118,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* 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 From 819a05aa3ab2c4d9cae22d6111e819ab7e33321c Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Fri, 11 Feb 2011 07:54:58 +0100 Subject: [PATCH 002/111] - fixes unused varable and coparison of different var types --- acpid-2.0.7-unused.patch | 29 +++++++++++++++++++++++++++++ acpid.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 acpid-2.0.7-unused.patch diff --git a/acpid-2.0.7-unused.patch b/acpid-2.0.7-unused.patch new file mode 100644 index 0000000..3d7e7d3 --- /dev/null +++ b/acpid-2.0.7-unused.patch @@ -0,0 +1,29 @@ +diff -up acpid-2.0.7/libnetlink.c.unused acpid-2.0.7/libnetlink.c +--- acpid-2.0.7/libnetlink.c.unused 2011-02-09 16:57:55.922298993 +0100 ++++ acpid-2.0.7/libnetlink.c 2011-02-09 16:59:02.927298890 +0100 +@@ -441,7 +441,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt + nladdr.nl_groups = 0; + + while (1) { +- int err, len, type; ++ int err, len; + int l; + + status = fread(&buf, 1, sizeof(*h), rtnl); +@@ -456,7 +456,6 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt + return 0; + + len = h->nlmsg_len; +- type= h->nlmsg_type; + l = len - sizeof(*h); + + if (l<0 || (unsigned)len>sizeof(buf)) { +@@ -518,7 +517,7 @@ int addattr_l(struct nlmsghdr *n, int ma + + int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len) + { +- if ((int)NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) { ++ if ((int)NLMSG_ALIGN(n->nlmsg_len) + (int)NLMSG_ALIGN(len) > maxlen) { + fprintf(stderr, "addraw_l ERROR: message exceeded bound of %d\n",maxlen); + return -1; + } diff --git a/acpid.spec b/acpid.spec index 7a1f606..7e981e7 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -13,6 +13,7 @@ Source5: acpid.service Source6: acpid.sysconfig Patch1: acpid-2.0.2-makefile.patch +Patch2: acpid-2.0.7-unused.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} @@ -31,6 +32,7 @@ acpid is a daemon that dispatches ACPI events to user-space programs. %setup -q %patch1 -p1 -b .makefile +%patch2 -p1 -b .unused %build make %{?_smp_mflags} @@ -116,6 +118,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* 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 From f38a65b545c526da8d8d0828564d78f32c762eaa Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 16 Feb 2011 09:45:07 +0100 Subject: [PATCH 003/111] - update to latest upstream 2.0.8 --- .gitignore | 1 + acpid-2.0.7-unused.patch | 29 ----------------------------- acpid.spec | 9 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 acpid-2.0.7-unused.patch diff --git a/.gitignore b/.gitignore index 0ffbf49..a6a8051 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ acpid-2.0.5.tar.gz /acpid-2.0.7.tar.gz +/acpid-2.0.8.tar.gz diff --git a/acpid-2.0.7-unused.patch b/acpid-2.0.7-unused.patch deleted file mode 100644 index 3d7e7d3..0000000 --- a/acpid-2.0.7-unused.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up acpid-2.0.7/libnetlink.c.unused acpid-2.0.7/libnetlink.c ---- acpid-2.0.7/libnetlink.c.unused 2011-02-09 16:57:55.922298993 +0100 -+++ acpid-2.0.7/libnetlink.c 2011-02-09 16:59:02.927298890 +0100 -@@ -441,7 +441,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt - nladdr.nl_groups = 0; - - while (1) { -- int err, len, type; -+ int err, len; - int l; - - status = fread(&buf, 1, sizeof(*h), rtnl); -@@ -456,7 +456,6 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt - return 0; - - len = h->nlmsg_len; -- type= h->nlmsg_type; - l = len - sizeof(*h); - - if (l<0 || (unsigned)len>sizeof(buf)) { -@@ -518,7 +517,7 @@ int addattr_l(struct nlmsghdr *n, int ma - - int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len) - { -- if ((int)NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) { -+ if ((int)NLMSG_ALIGN(n->nlmsg_len) + (int)NLMSG_ALIGN(len) > maxlen) { - fprintf(stderr, "addraw_l ERROR: message exceeded bound of %d\n",maxlen); - return -1; - } diff --git a/acpid.spec b/acpid.spec index 7e981e7..cafd8ca 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.7 -Release: 3%{?dist} +Version: 2.0.8 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -13,7 +13,6 @@ Source5: acpid.service Source6: acpid.sysconfig Patch1: acpid-2.0.2-makefile.patch -Patch2: acpid-2.0.7-unused.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} @@ -32,7 +31,6 @@ acpid is a daemon that dispatches ACPI events to user-space programs. %setup -q %patch1 -p1 -b .makefile -%patch2 -p1 -b .unused %build make %{?_smp_mflags} @@ -118,6 +116,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* 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 diff --git a/sources b/sources index e9810f3..4806bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84832448304e0b19c8cf566fe5b64be0 acpid-2.0.7.tar.gz +7e5ede75e37ccaaf75536bc44cf214fc acpid-2.0.8.tar.gz From 0d82e6ab6aa2fcaebbd77e1fde43d5c423ab915d Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 18 Apr 2011 08:24:06 +0200 Subject: [PATCH 004/111] update to latest upstream 2.0.9 --- .gitignore | 1 + acpid.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a6a8051..a33ef0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.7.tar.gz /acpid-2.0.8.tar.gz +/acpid-2.0.9.tar.gz diff --git a/acpid.spec b/acpid.spec index cafd8ca..7191be6 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,6 +1,6 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.8 +Version: 2.0.9 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -116,6 +116,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* 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 diff --git a/sources b/sources index 4806bad..7597217 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e5ede75e37ccaaf75536bc44cf214fc acpid-2.0.8.tar.gz +8b30aa1b31f607161745a4ac7a19699b acpid-2.0.9.tar.gz From 05975bc8b7f3f4272da603ae6679d382180eaa2d Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Tue, 3 May 2011 09:17:44 +0200 Subject: [PATCH 005/111] fixes #701340 - CVE-2011-1159 acpid: blocked writes can lead to acpid daemon hang update to latest upstream 2.0.9 --- .gitignore | 1 + acpid-2.0.7-unused.patch | 29 ----------------------------- acpid.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 acpid-2.0.7-unused.patch diff --git a/.gitignore b/.gitignore index 0ffbf49..b9db971 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ acpid-2.0.5.tar.gz /acpid-2.0.7.tar.gz +/acpid-2.0.9.tar.gz diff --git a/acpid-2.0.7-unused.patch b/acpid-2.0.7-unused.patch deleted file mode 100644 index 3d7e7d3..0000000 --- a/acpid-2.0.7-unused.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up acpid-2.0.7/libnetlink.c.unused acpid-2.0.7/libnetlink.c ---- acpid-2.0.7/libnetlink.c.unused 2011-02-09 16:57:55.922298993 +0100 -+++ acpid-2.0.7/libnetlink.c 2011-02-09 16:59:02.927298890 +0100 -@@ -441,7 +441,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt - nladdr.nl_groups = 0; - - while (1) { -- int err, len, type; -+ int err, len; - int l; - - status = fread(&buf, 1, sizeof(*h), rtnl); -@@ -456,7 +456,6 @@ int rtnl_from_file(FILE *rtnl, rtnl_filt - return 0; - - len = h->nlmsg_len; -- type= h->nlmsg_type; - l = len - sizeof(*h); - - if (l<0 || (unsigned)len>sizeof(buf)) { -@@ -518,7 +517,7 @@ int addattr_l(struct nlmsghdr *n, int ma - - int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len) - { -- if ((int)NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) { -+ if ((int)NLMSG_ALIGN(n->nlmsg_len) + (int)NLMSG_ALIGN(len) > maxlen) { - fprintf(stderr, "addraw_l ERROR: message exceeded bound of %d\n",maxlen); - return -1; - } diff --git a/acpid.spec b/acpid.spec index 7e981e7..90be15d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,6 +1,6 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.7 +Version: 2.0.9 Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -13,7 +13,6 @@ Source5: acpid.service Source6: acpid.sysconfig Patch1: acpid-2.0.2-makefile.patch -Patch2: acpid-2.0.7-unused.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} @@ -32,7 +31,6 @@ acpid is a daemon that dispatches ACPI events to user-space programs. %setup -q %patch1 -p1 -b .makefile -%patch2 -p1 -b .unused %build make %{?_smp_mflags} @@ -118,6 +116,10 @@ if [ "$1" -ge "1" ]; then fi %changelog +* Tue May 03 2011 Jiri Skala - 2.0.9-1 +- fixes #701340 - CVE-2011-1159 acpid: blocked writes can lead to acpid daemon hang +- update to latest upstream 2.0.9 + * Wed Feb 09 2011 Jiri Skala - 2.0.7-3 - fixes unused varable and coparison of different var types diff --git a/sources b/sources index e9810f3..7597217 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84832448304e0b19c8cf566fe5b64be0 acpid-2.0.7.tar.gz +8b30aa1b31f607161745a4ac7a19699b acpid-2.0.9.tar.gz From f51d94ff81e875775d35a646f428bd8fb1c00811 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Tue, 3 May 2011 09:49:59 +0200 Subject: [PATCH 006/111] update to latest upstream 2.0.9 --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 7191be6..9759e6a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.9 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -116,6 +116,9 @@ if [ "$1" -ge "1" ]; then fi %changelog +* 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 From 71dcd3339f011119be72a670aa38d74f9614d3c7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 5 May 2011 16:41:56 -0400 Subject: [PATCH 007/111] Fix systemd-related scriptlets. 1) Add a trigger to migrate state on upgrade from prior versions 2) Don't try to stop/disable a acpid.socket unit that doesn't exist. --- acpid.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 90be15d..9e6be8d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -102,8 +102,8 @@ if [ "$1" = "0" ]; then /sbin/service acpid stop >/dev/null 2>&1 /sbin/chkconfig --del acpid - /bin/systemctl disable %{name}.service %{name}.socket > /dev/null 2>&1 || : - /bin/systemctl stop %{name}.service %{name}.socket > /dev/null 2>&1 || : + /bin/systemctl disable %{name}.service > /dev/null 2>&1 || : + /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : fi @@ -115,6 +115,11 @@ if [ "$1" -ge "1" ]; then /bin/systemctl try-restart %{name}.service > /dev/null 2>&1 || : fi +%triggerun -- acpid < 2.0.9 +if /sbin/chkconfig --level 3 acpid ; then + /bin/systemctl enable acpid.service >/dev/null 2>&1 || : +fi + %changelog * Tue May 03 2011 Jiri Skala - 2.0.9-1 - fixes #701340 - CVE-2011-1159 acpid: blocked writes can lead to acpid daemon hang From 777ab6a93408d1ba4f415ae8997794df84623876 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 6 May 2011 12:00:37 -0400 Subject: [PATCH 008/111] Bump release, add changelog. --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 9e6be8d..d66bbdd 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -121,6 +121,9 @@ if /sbin/chkconfig --level 3 acpid ; then fi %changelog +* 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-1 - fixes #701340 - CVE-2011-1159 acpid: blocked writes can lead to acpid daemon hang - update to latest upstream 2.0.9 From c3b9ff1829e26578ccbfb0e10c6299fafc6d5667 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 5 May 2011 16:41:56 -0400 Subject: [PATCH 009/111] Fix systemd-related scriptlets. 1) Add a trigger to migrate state on upgrade from prior versions 2) Don't try to stop/disable a acpid.socket unit that doesn't exist. --- acpid.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 9759e6a..5f316e9 100644 --- a/acpid.spec +++ b/acpid.spec @@ -102,8 +102,8 @@ if [ "$1" = "0" ]; then /sbin/service acpid stop >/dev/null 2>&1 /sbin/chkconfig --del acpid - /bin/systemctl disable %{name}.service %{name}.socket > /dev/null 2>&1 || : - /bin/systemctl stop %{name}.service %{name}.socket > /dev/null 2>&1 || : + /bin/systemctl disable %{name}.service > /dev/null 2>&1 || : + /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : fi @@ -115,6 +115,11 @@ if [ "$1" -ge "1" ]; then /bin/systemctl try-restart %{name}.service > /dev/null 2>&1 || : fi +%triggerun -- acpid < 2.0.9 +if /sbin/chkconfig --level 3 acpid ; then + /bin/systemctl enable acpid.service >/dev/null 2>&1 || : +fi + %changelog * Tue May 03 2011 Jiri Skala - 2.0.9-3 - corrected relase number to be min equal to f15 From a9c56b39202fcff6b009d65b3ccdc143ea0d26b0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 6 May 2011 12:03:10 -0400 Subject: [PATCH 010/111] Bump release, add changelog. --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 5f316e9..c6cf6b3 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -121,6 +121,9 @@ if /sbin/chkconfig --level 3 acpid ; then fi %changelog +* 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 From b79a0fa2012df9ec10330f5aa13bba42ac4f68d4 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 18 May 2011 10:19:41 +0200 Subject: [PATCH 011/111] update to latest upstream 2.0.10 --- .gitignore | 1 + acpid.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a33ef0f..2776d68 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.7.tar.gz /acpid-2.0.8.tar.gz /acpid-2.0.9.tar.gz +/acpid-2.0.10.tar.gz diff --git a/acpid.spec b/acpid.spec index c6cf6b3..1feb724 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.9 -Release: 4%{?dist} +Version: 2.0.10 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -121,6 +121,9 @@ if /sbin/chkconfig --level 3 acpid ; then fi %changelog +* 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 diff --git a/sources b/sources index 7597217..95be861 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b30aa1b31f607161745a4ac7a19699b acpid-2.0.9.tar.gz +d5dd88bcfaa4a0bf51905e95115da6df acpid-2.0.10.tar.gz From 0040c616238da278bfadddaa99119f7d4d71b3ef Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 27 Jun 2011 16:13:29 +0200 Subject: [PATCH 012/111] fixes #716923 - move SysV initscript file into an optional subpackage --- acpid.spec | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/acpid.spec b/acpid.spec index 1feb724..c167802 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -19,13 +19,20 @@ ExclusiveArch: ia64 x86_64 %{ix86} URL: http://tedfelix.com/linux/acpid-netlink.html Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service Requires: systemd-units %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 @@ -74,10 +81,11 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/acpid %{_bindir}/acpi_listen %{_sbindir}/acpid -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid %{_mandir}/man8/acpid.8.gz %{_mandir}/man8/acpi_listen.8.gz +%files sysvinit +%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid %pre if [ "$1" = "2" ]; then @@ -93,15 +101,11 @@ fi %post if [ $1 -eq 1 ]; then - /sbin/chkconfig --add acpid /bin/systemctl enable %{name}.service > /dev/null 2>&1 || : fi %preun if [ "$1" = "0" ]; then - /sbin/service acpid stop >/dev/null 2>&1 - /sbin/chkconfig --del acpid - /bin/systemctl disable %{name}.service > /dev/null 2>&1 || : /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : @@ -109,18 +113,22 @@ fi %postun if [ "$1" -ge "1" ]; then - /sbin/service acpid condrestart >/dev/null 2>&1 - /bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl try-restart %{name}.service > /dev/null 2>&1 || : fi -%triggerun -- acpid < 2.0.9 -if /sbin/chkconfig --level 3 acpid ; then - /bin/systemctl enable acpid.service >/dev/null 2>&1 || : -fi +%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 +* 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 From 69ae1a498c5eb4e7c4088712de691a5ed7927720 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 1 Aug 2011 12:29:39 +0200 Subject: [PATCH 013/111] updated to latest upstream 2.0.11 --- .gitignore | 1 + acpid.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2776d68..c4770a6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.8.tar.gz /acpid-2.0.9.tar.gz /acpid-2.0.10.tar.gz +/acpid-2.0.11.tar.gz diff --git a/acpid.spec b/acpid.spec index c167802..29286d1 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.10 -Release: 2%{?dist} +Version: 2.0.11 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -126,6 +126,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 95be861..bff66c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5dd88bcfaa4a0bf51905e95115da6df acpid-2.0.10.tar.gz +7e1211ce72cad4bfc500bfc1051c4c85 acpid-2.0.11.tar.gz From e129df4cf39860d5c3bd3a0d64f6730a85a824b5 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Tue, 16 Aug 2011 13:02:52 +0200 Subject: [PATCH 014/111] updated to latest upstream 2.0.12 --- .gitignore | 1 + acpid.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c4770a6..ebc4f74 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.9.tar.gz /acpid-2.0.10.tar.gz /acpid-2.0.11.tar.gz +/acpid-2.0.12.tar.gz diff --git a/acpid.spec b/acpid.spec index 29286d1..b54bf9e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,6 +1,6 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.11 +Version: 2.0.12 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -126,6 +126,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index bff66c4..4341256 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e1211ce72cad4bfc500bfc1051c4c85 acpid-2.0.11.tar.gz +c5104722f72451f64f893b5541bd9ab4 acpid-2.0.12.tar.gz From b258cd2e4558be89e86d2444d096df437b07201d Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 16 Nov 2011 14:08:52 +0100 Subject: [PATCH 015/111] updated to latest upstream 2.0.13 --- .gitignore | 1 + acpid.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ebc4f74..4560ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.10.tar.gz /acpid-2.0.11.tar.gz /acpid-2.0.12.tar.gz +/acpid-2.0.13.tar.gz diff --git a/acpid.spec b/acpid.spec index b54bf9e..1e76ddd 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,6 +1,6 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.12 +Version: 2.0.13 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -126,6 +126,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 4341256..c6cd3af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5104722f72451f64f893b5541bd9ab4 acpid-2.0.12.tar.gz +5bbbb9a320192df1cdd8d0e9a0196379 acpid-2.0.13.tar.gz From 7449877b822c42ea680f728aa259744a2642fa13 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 16 Nov 2011 14:26:37 +0100 Subject: [PATCH 016/111] update to latest upstream 2.0.13 --- .gitignore | 1 + acpid.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b9db971..ad7643a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.7.tar.gz /acpid-2.0.9.tar.gz +/acpid-2.0.13.tar.gz diff --git a/acpid.spec b/acpid.spec index d66bbdd..3ead9a0 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.9 -Release: 4%{?dist} +Version: 2.0.13 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -121,6 +121,9 @@ if /sbin/chkconfig --level 3 acpid ; then fi %changelog +* Wed Nov 16 2011 Jiri Skala - 2.0.13-1 +- update to latest upstream 2.0.13 + * Fri May 06 2011 Bill Nottingham - 2.0.9-4 - fix systemd scriptlets to properly handle upgrade diff --git a/sources b/sources index 7597217..c6cd3af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b30aa1b31f607161745a4ac7a19699b acpid-2.0.9.tar.gz +5bbbb9a320192df1cdd8d0e9a0196379 acpid-2.0.13.tar.gz From 7f54861771b2b9166031d319d70e88834df59fc4 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 19 Dec 2011 19:42:10 +0100 Subject: [PATCH 017/111] updated to latest upstream 2.0.14 --- .gitignore | 1 + acpid.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4560ee1..7083c42 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.11.tar.gz /acpid-2.0.12.tar.gz /acpid-2.0.13.tar.gz +/acpid-2.0.14.tar.gz diff --git a/acpid.spec b/acpid.spec index 1e76ddd..1ed603b 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,6 +1,6 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.13 +Version: 2.0.14 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -126,6 +126,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index c6cd3af..d2da350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5bbbb9a320192df1cdd8d0e9a0196379 acpid-2.0.13.tar.gz +14fc1eabc3489f3ded9347fcd55f158a acpid-2.0.14.tar.gz From f8a00bd854b7f9834784291622b9143e9f962953 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 2 Jan 2012 14:51:20 +0100 Subject: [PATCH 018/111] fixes #722325 - xfce4-power-manager does not seem to be supported --- acpid.power.sh | 1 + acpid.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/acpid.power.sh b/acpid.power.sh index ebf0770..dfd2a6d 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -22,6 +22,7 @@ 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 } diff --git a/acpid.spec b/acpid.spec index 1ed603b..4f6311a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -126,6 +126,9 @@ fi %changelog +* Mon Jan 02 2011 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 From 7b6d2950a62787d1cf0fabbef5b34ab73a930cb3 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 2 Jan 2012 14:52:25 +0100 Subject: [PATCH 019/111] corrected date in changelog --- acpid.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4f6311a..3ca5670 100644 --- a/acpid.spec +++ b/acpid.spec @@ -126,7 +126,7 @@ fi %changelog -* Mon Jan 02 2011 Jiri Skala - 2.0.14-2 +* 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 From 758260fc7bdd20d2e77d63b7797bc550c50c65a9 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 2 Jan 2012 15:07:43 +0100 Subject: [PATCH 020/111] updated to latest upstream 2.0.14 fixes #722325 - xfce4-power-manager does not seem to be supported --- .gitignore | 1 + acpid.power.sh | 1 + acpid.spec | 6 +++++- sources | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ad7643a..c5fe2d0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.7.tar.gz /acpid-2.0.9.tar.gz /acpid-2.0.13.tar.gz +/acpid-2.0.14.tar.gz diff --git a/acpid.power.sh b/acpid.power.sh index ebf0770..dfd2a6d 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -22,6 +22,7 @@ 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 } diff --git a/acpid.spec b/acpid.spec index 3ead9a0..421d51f 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,6 +1,6 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.13 +Version: 2.0.14 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -121,6 +121,10 @@ if /sbin/chkconfig --level 3 acpid ; then fi %changelog +* Mon Jan 02 2012 Jiri Skala - 2.0.14-1 +- updated to latest upstream 2.0.14 +- fixes #722325 - xfce4-power-manager does not seem to be supported + * Wed Nov 16 2011 Jiri Skala - 2.0.13-1 - update to latest upstream 2.0.13 diff --git a/sources b/sources index c6cd3af..d2da350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5bbbb9a320192df1cdd8d0e9a0196379 acpid-2.0.13.tar.gz +14fc1eabc3489f3ded9347fcd55f158a acpid-2.0.14.tar.gz From 0f27a85b002e63b2e336784986ec73c0a2a7ef5b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:59:56 -0600 Subject: [PATCH 021/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 3ca5670..ea54e8e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.14 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -126,6 +126,9 @@ fi %changelog +* 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 From 2025c11fe5dc9196cca2ab63a32f70c7399ff761 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Fri, 16 Mar 2012 07:26:15 +0100 Subject: [PATCH 022/111] updated to latest upstream 2.0.15 --- .gitignore | 1 + acpid.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7083c42..b9d4e25 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ acpid-2.0.5.tar.gz /acpid-2.0.12.tar.gz /acpid-2.0.13.tar.gz /acpid-2.0.14.tar.gz +/acpid-2.0.15.tar.xz diff --git a/acpid.spec b/acpid.spec index ea54e8e..f1acb50 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.14 -Release: 3%{?dist} +Version: 2.0.15 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -126,6 +126,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index d2da350..28b9140 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14fc1eabc3489f3ded9347fcd55f158a acpid-2.0.14.tar.gz +1b1c8775adab6a994a386c45af6b86dc acpid-2.0.15.tar.xz From a0d0e3b0837eec5d5c522c48a75383a06274e54e Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Fri, 16 Mar 2012 11:44:43 +0100 Subject: [PATCH 023/111] replaced makefile patch by new on, added kacpimon --- acpid-2.0.15-mk.patch | 24 ++++++++++++++++++++++++ acpid-2.0.2-makefile.patch | 30 ------------------------------ acpid.spec | 9 ++++++--- 3 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 acpid-2.0.15-mk.patch delete mode 100644 acpid-2.0.2-makefile.patch diff --git a/acpid-2.0.15-mk.patch b/acpid-2.0.15-mk.patch new file mode 100644 index 0000000..0168986 --- /dev/null +++ b/acpid-2.0.15-mk.patch @@ -0,0 +1,24 @@ +diff -up acpid-2.0.15/Makefile.am.mk acpid-2.0.15/Makefile.am +--- acpid-2.0.15/Makefile.am.mk 2012-02-17 04:37:12.109907134 +0100 ++++ acpid-2.0.15/Makefile.am 2012-03-16 11:27:15.127573044 +0100 +@@ -20,7 +20,7 @@ acpi_listen_SOURCES = acpi_listen.c log. + + dist_man8_MANS = acpid.8 acpi_listen.8 + +-dist_doc_DATA = COPYING Changelog README TESTPLAN TODO ++dist_doc_DATA = + + # Just docs to add to the dist. + # One problem with this is that it includes all files in the samples dir +diff -up acpid-2.0.15/Makefile.in.mk acpid-2.0.15/Makefile.in +--- acpid-2.0.15/Makefile.in.mk 2012-03-16 11:28:53.568421905 +0100 ++++ acpid-2.0.15/Makefile.in 2012-03-16 11:29:21.679378750 +0100 +@@ -276,7 +276,7 @@ acpid_SOURCES = acpid.c acpi_ids.c conne + + acpi_listen_SOURCES = acpi_listen.c log.c ud_socket.c + dist_man8_MANS = acpid.8 acpi_listen.8 +-dist_doc_DATA = COPYING Changelog README TESTPLAN TODO ++dist_doc_DATA = + + # Just docs to add to the dist. + # One problem with this is that it includes all files in the samples dir diff --git a/acpid-2.0.2-makefile.patch b/acpid-2.0.2-makefile.patch deleted file mode 100644 index 0ba9e79..0000000 --- a/acpid-2.0.2-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile ---- acpid-2.0.2/Makefile.makefile 2010-01-27 00:36:23.000000000 +0100 -+++ acpid-2.0.2/Makefile 2010-02-25 16:01:39.641024017 +0100 -@@ -31,8 +31,9 @@ MAN8GZ = $(MAN8:.8=.8.gz) - - DOCS = COPYING Changelog README TESTPLAN TODO - --CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE $(OPT) \ -- -fno-strict-aliasing -g $(DEFS) -+CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE -O2 $(OPT) \ -+ -fno-strict-aliasing -g $(DEFS) $(RPM_OPT_FLAGS) -fPIE -+LDFLAGS = -pie -Wl,-z,relro - DEFS = -DVERSION="\"$(VERSION)\"" - - all: $(PROGS) -@@ -46,8 +47,8 @@ man: $(MAN8) - - install_docs: - mkdir -p $(DESTDIR)/$(DOCDIR) -- for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done -- cp -a samples $(DESTDIR)/$(DOCDIR) -+ #for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done -+ #cp -a samples $(DESTDIR)/$(DOCDIR) - - install: $(PROGS) man install_docs - mkdir -p $(DESTDIR)/$(SBINDIR) diff --git a/acpid.spec b/acpid.spec index f1acb50..c2429d5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -4,7 +4,7 @@ Version: 2.0.15 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz +Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz Source1: acpid.init Source2: acpid.video.conf Source3: acpid.power.conf @@ -12,7 +12,7 @@ Source4: acpid.power.sh Source5: acpid.service Source6: acpid.sysconfig -Patch1: acpid-2.0.2-makefile.patch +Patch1: acpid-2.0.15-mk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} @@ -37,9 +37,10 @@ The acpid-sysvinit contains SysV initscript. %prep %setup -q -%patch1 -p1 -b .makefile +%patch1 -p1 -b .mk %build +%configure make %{?_smp_mflags} @@ -81,8 +82,10 @@ rm -rf $RPM_BUILD_ROOT %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 From 3c5fffae22e31e6facd72e1ffc14657384f324d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 29 Mar 2012 17:37:13 +0200 Subject: [PATCH 024/111] New version --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index c2429d5..f74f774 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,6 +1,6 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.15 +Version: 2.0.16 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -129,6 +129,9 @@ fi %changelog +* 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 From 34964ec2594fcca936a71a98e5420874a14a0bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 29 Mar 2012 17:43:37 +0200 Subject: [PATCH 025/111] Uploaded new sources --- .gitignore | 11 +---------- sources | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b9d4e25..e484e16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -acpid-2.0.5.tar.gz -/acpid-2.0.7.tar.gz -/acpid-2.0.8.tar.gz -/acpid-2.0.9.tar.gz -/acpid-2.0.10.tar.gz -/acpid-2.0.11.tar.gz -/acpid-2.0.12.tar.gz -/acpid-2.0.13.tar.gz -/acpid-2.0.14.tar.gz -/acpid-2.0.15.tar.xz +acpid-*.tar.xz diff --git a/sources b/sources index 28b9140..ccbc7bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b1c8775adab6a994a386c45af6b86dc acpid-2.0.15.tar.xz +d59fc02c9c34f0d5c137495302e2c074 acpid-2.0.16.tar.xz From b8a715fc3f67adbaeac29259e9a7ca40db7456c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 14 Jun 2012 10:50:36 +0200 Subject: [PATCH 026/111] Added support for systemd-loginctl list-sessions Resolves: rhbz#819559 --- acpid.power.sh | 11 ++++++++++- acpid.spec | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index dfd2a6d..a8e0b18 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -2,7 +2,16 @@ PATH=/sbin:/bin:/usr/bin -# Get the ID of the first active X11 session: +# 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}) + if [ -n "$(echo "${session_status}" | grep "Active: yes" 2> /dev/null)" ]; then + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|kded4\|xfce4-power-manager\)' >& /dev/null && exit 0 + fi +done + +# Get the ID of the first active X11 session: using ConsoleKit uid_session=$( ck-list-sessions | \ awk ' diff --git a/acpid.spec b/acpid.spec index f74f774..8c68472 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz @@ -129,6 +129,10 @@ fi %changelog +* 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 From ade213e454ee6bf95322fff8a5ca415faf07b8ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 14 Jun 2012 15:03:01 +0200 Subject: [PATCH 027/111] Silenced possible ck-list-sessions errors in power.sh --- acpid.power.sh | 2 +- acpid.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index a8e0b18..c13cf7e 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -13,7 +13,7 @@ done # Get the ID of the first active X11 session: using ConsoleKit uid_session=$( -ck-list-sessions | \ +ck-list-sessions 2>/dev/null | \ awk ' /^Session[0-9]+:$/ { uid = active = x11 = "" ; next } { gsub(/'\''/, "", $3) } diff --git a/acpid.spec b/acpid.spec index 8c68472..aad00ba 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.16 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz @@ -129,6 +129,9 @@ fi %changelog +* 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 From c8725a622bf350ed680445add5ea01bb54908cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 9 Jul 2012 09:38:51 +0200 Subject: [PATCH 028/111] Update of power.sh to be compatible with new systemd-loginctl Resolves: rhbz#819547 --- acpid.power.sh | 5 ++--- acpid.spec | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index c13cf7e..97a5fbc 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -6,9 +6,8 @@ PATH=/sbin:/bin:/usr/bin 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}) - if [ -n "$(echo "${session_status}" | grep "Active: yes" 2> /dev/null)" ]; then - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|kded4\|xfce4-power-manager\)' >& /dev/null && exit 0 - fi + 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 diff --git a/acpid.spec b/acpid.spec index aad00ba..b1eaf9b 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.16 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz @@ -129,6 +129,10 @@ fi %changelog +* 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 From cb2db2017b61dfa9bc24d77d4739d15294bd69e0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:33:20 -0500 Subject: [PATCH 029/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index b1eaf9b..85d6135 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.16 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz @@ -129,6 +129,9 @@ fi %changelog +* 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 From c16f618b5a567e50ffb0c7a6a466da9dce1dd8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Sep 2012 11:53:16 +0200 Subject: [PATCH 030/111] New version Resolves: rhbz#857695 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 85d6135..ce87903 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.16 -Release: 5%{?dist} +Version: 2.0.17 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz @@ -129,6 +129,10 @@ fi %changelog +* 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 diff --git a/sources b/sources index ccbc7bd..28718a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d59fc02c9c34f0d5c137495302e2c074 acpid-2.0.16.tar.xz +d858729b7d984c5e3a0c7558e9de1584 acpid-2.0.17.tar.xz From 3d572e8852184305c601890f9a8715cb5c564b12 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:15:28 -0600 Subject: [PATCH 031/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index ce87903..15fe24d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz @@ -129,6 +129,9 @@ fi %changelog +* 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 From b3d1626d0f01c47931d14c9aadfba0ea7c75180e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 Feb 2013 15:22:26 +0100 Subject: [PATCH 032/111] 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 --- acpid-2.0.15-mk.patch | 24 -------------------- acpid.spec | 52 ++++++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 28 insertions(+), 50 deletions(-) delete mode 100644 acpid-2.0.15-mk.patch diff --git a/acpid-2.0.15-mk.patch b/acpid-2.0.15-mk.patch deleted file mode 100644 index 0168986..0000000 --- a/acpid-2.0.15-mk.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up acpid-2.0.15/Makefile.am.mk acpid-2.0.15/Makefile.am ---- acpid-2.0.15/Makefile.am.mk 2012-02-17 04:37:12.109907134 +0100 -+++ acpid-2.0.15/Makefile.am 2012-03-16 11:27:15.127573044 +0100 -@@ -20,7 +20,7 @@ acpi_listen_SOURCES = acpi_listen.c log. - - dist_man8_MANS = acpid.8 acpi_listen.8 - --dist_doc_DATA = COPYING Changelog README TESTPLAN TODO -+dist_doc_DATA = - - # Just docs to add to the dist. - # One problem with this is that it includes all files in the samples dir -diff -up acpid-2.0.15/Makefile.in.mk acpid-2.0.15/Makefile.in ---- acpid-2.0.15/Makefile.in.mk 2012-03-16 11:28:53.568421905 +0100 -+++ acpid-2.0.15/Makefile.in 2012-03-16 11:29:21.679378750 +0100 -@@ -276,7 +276,7 @@ acpid_SOURCES = acpid.c acpi_ids.c conne - - acpi_listen_SOURCES = acpi_listen.c log.c ud_socket.c - dist_man8_MANS = acpid.8 acpi_listen.8 --dist_doc_DATA = COPYING Changelog README TESTPLAN TODO -+dist_doc_DATA = - - # Just docs to add to the dist. - # One problem with this is that it includes all files in the samples dir diff --git a/acpid.spec b/acpid.spec index 15fe24d..b4b882a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,22 +1,19 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.17 -Release: 2%{?dist} +Version: 2.0.18 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz +Source: http://downloads.sourceforge.net/%{name}/%{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 - -Patch1: acpid-2.0.15-mk.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} -URL: http://tedfelix.com/linux/acpid-netlink.html +URL: http://sourceforge.net/projects/acpid2/ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires: systemd-units @@ -37,7 +34,6 @@ The acpid-sysvinit contains SysV initscript. %prep %setup -q -%patch1 -p1 -b .mk %build %configure @@ -45,33 +41,33 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +mkdir -p %{buildroot} +make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions -mkdir -p $RPM_BUILD_ROOT/lib/systemd/system -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +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 $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/videoconf -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/powerconf -install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/power.sh -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/lib/systemd/system -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/acpid +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 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/acpid +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) -%doc COPYING README Changelog TODO TESTPLAN +%doc %{_docdir}/%{name}-%{version} /lib/systemd/system/%{name}.service %dir %{_sysconfdir}/acpi %dir %{_sysconfdir}/acpi/events @@ -129,6 +125,12 @@ fi %changelog +* 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 diff --git a/sources b/sources index 28718a2..30f5343 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d858729b7d984c5e3a0c7558e9de1584 acpid-2.0.17.tar.xz +7c4ff315ae960c54eea303c71c49f152 acpid-2.0.18.tar.xz From c4f58299a08d69ac2cab6d3716b76a816c68b0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 15 Feb 2013 16:10:38 +0100 Subject: [PATCH 033/111] Fixed source URL --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index b4b882a..4e4132d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,10 +1,10 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz +Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source1: acpid.init Source2: acpid.video.conf Source3: acpid.power.conf @@ -125,6 +125,9 @@ fi %changelog +* 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 From 5607deb6b60b4b05d6b3b35006683fce6fca395a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Feb 2013 14:58:23 +0100 Subject: [PATCH 034/111] Switched to systemd-rpm macros Resolves: rhbz#850020 --- acpid.spec | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/acpid.spec b/acpid.spec index 4e4132d..942196e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.18 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -16,7 +16,7 @@ ExclusiveArch: ia64 x86_64 %{ix86} URL: http://sourceforge.net/projects/acpid2/ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig -Requires: systemd-units +Requires: systemd %description @@ -99,22 +99,13 @@ if [ "$1" = "2" ]; then fi %post -if [ $1 -eq 1 ]; then - /bin/systemctl enable %{name}.service > /dev/null 2>&1 || : -fi +%systemd_post %{name}.service %preun -if [ "$1" = "0" ]; then - /bin/systemctl disable %{name}.service > /dev/null 2>&1 || : - /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : - -fi +%systemd_preun %{name}.service %postun -if [ "$1" -ge "1" ]; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl try-restart %{name}.service > /dev/null 2>&1 || : -fi +%systemd_postun_with_restart %{name}.service %triggerun -- %{name} < 2.0.10-2 /sbin/chkconfig --del acpid >/dev/null 2>&1 || : @@ -125,6 +116,10 @@ fi %changelog +* 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 From 15dedb94d7dd283ecfbc0c61229b8b80dafdf2de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 May 2013 15:29:30 +0200 Subject: [PATCH 035/111] New version --- acpid.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 942196e..fc24d09 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.18 -Release: 3%{?dist} +Version: 2.0.19 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -116,6 +116,9 @@ fi %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 diff --git a/sources b/sources index 30f5343..d3c324d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c4ff315ae960c54eea303c71c49f152 acpid-2.0.18.tar.xz +0b07a982e3e28cf37645f2c6269af72e acpid-2.0.19.tar.xz From d7536aa6653c66657b9cdf4900581edf76ac5401 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:12:48 -0500 Subject: [PATCH 036/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index fc24d09..d918d80 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.19 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -116,6 +116,9 @@ fi %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.0.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue May 28 2013 Jaroslav Škarvada - 2.0.19-1 - New version From 17778b5e561bbbed18968554e1fbc3e1f091568f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 6 Aug 2013 13:36:00 +0200 Subject: [PATCH 037/111] Used unversioned docs Resolves: rhbz#993661 --- acpid.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index d918d80..bcef30b 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.19 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -43,7 +43,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot} -make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} +make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/acpi/events mkdir -p %{buildroot}%{_sysconfdir}/acpi/actions @@ -67,7 +67,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -%doc %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name} /lib/systemd/system/%{name}.service %dir %{_sysconfdir}/acpi %dir %{_sysconfdir}/acpi/events @@ -116,6 +116,10 @@ fi %changelog +* Tue Aug 6 2013 Jaroslav Škarvada - 2.0.19-3 +- Used unversioned docs + Resolves: rhbz#993661 + * Sat Aug 03 2013 Fedora Release Engineering - 2.0.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8d9ff22c5f04497abbcdfe9c5dafbd4a9412d9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 9 Aug 2013 10:57:59 +0200 Subject: [PATCH 038/111] Fixed systemd requires Resolves: rhbz#995158 --- acpid.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index bcef30b..9d377ea 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.19 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -14,8 +14,9 @@ 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(post): systemd +Requires(preun): systemd +Requires(postun): systemd Requires: systemd @@ -116,6 +117,10 @@ fi %changelog +* Fri Aug 9 2013 Jaroslav Škarvada - 2.0.19-4 +- Fixed systemd requires + Resolves: rhbz#995158 + * Tue Aug 6 2013 Jaroslav Škarvada - 2.0.19-3 - Used unversioned docs Resolves: rhbz#993661 From 29a7e4669c966639a6b121d11108d077c601691a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Aug 2013 14:26:45 +0200 Subject: [PATCH 039/111] Hardened build Resolves: rhbz#983609 --- acpid.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 9d377ea..97a0e94 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,14 @@ +# hardened build if not overrided +%{!?_hardened_build:%global _hardened_build 1} + +%if %{?_hardened_build:%{_hardened_build}}%{!?_hardened_build:0} +%global harden -pie -Wl,-z,relro,-z,now +%endif + Summary: ACPI Event Daemon Name: acpid Version: 2.0.19 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -38,7 +45,7 @@ The acpid-sysvinit contains SysV initscript. %build %configure -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="%{optflags} %{?harden}" %install @@ -117,6 +124,10 @@ fi %changelog +* Mon Aug 12 2013 Jaroslav Škarvada - 2.0.19-5 +- Hardened build + Resolves: rhbz#983609 + * Fri Aug 9 2013 Jaroslav Škarvada - 2.0.19-4 - Fixed systemd requires Resolves: rhbz#995158 From 9438bd6a36579f7bab246c45a602a1c0523dfbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 14 Aug 2013 16:19:32 +0200 Subject: [PATCH 040/111] Added systemd build requires Resolves: rhbz#995158 --- acpid.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 97a0e94..c080db2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.19 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -21,6 +21,7 @@ Source6: acpid.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} URL: http://sourceforge.net/projects/acpid2/ +BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -124,6 +125,10 @@ fi %changelog +* Wed Aug 14 2013 Jaroslav Škarvada - 2.0.19-6 +- Added systemd build requires + Resolves: rhbz#995158 + * Mon Aug 12 2013 Jaroslav Škarvada - 2.0.19-5 - Hardened build Resolves: rhbz#983609 From d0e3cdb8211f7923b43d492ef8951899af4208f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 16 Sep 2013 11:08:09 +0200 Subject: [PATCH 041/111] New version Resolves: rhbz#1008344 - Fixed bogus date in changelog (best effort) --- acpid.spec | 11 ++++++++--- sources | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/acpid.spec b/acpid.spec index c080db2..48acf95 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.19 -Release: 6%{?dist} +Version: 2.0.20 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -125,6 +125,11 @@ fi %changelog +* Mon Sep 16 2013 Jaroslav Škarvada - 2.0.20-1 +- New version + Resolves: rhbz#1008344 +- Fixed bogus date in changelog (best effort) + * Wed Aug 14 2013 Jaroslav Škarvada - 2.0.19-6 - Added systemd build requires Resolves: rhbz#995158 @@ -296,7 +301,7 @@ fi - Fixed socket leak (#394431) - Fixed dumping useless info to log (#389581) -* Thu Oct 23 2007 Zdenek Prikryl - 1.0.6-3.fc9 +* Tue Oct 23 2007 Zdenek Prikryl - 1.0.6-3.fc9 - Silent initscript - Resolves: #345611 diff --git a/sources b/sources index d3c324d..9fd6959 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b07a982e3e28cf37645f2c6269af72e acpid-2.0.19.tar.xz +1b740e6419cf45aaeb2bd78d589f27f9 acpid-2.0.20.tar.xz From 31682fe72c44feccb8c395ede54008f70bf172d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 13 Nov 2013 16:34:59 +0100 Subject: [PATCH 042/111] Fixed loginctl and added support for cinnamon and mate (patch by Leigh Scott) Resolves: rhbz#1029868 --- acpid.power.sh | 12 +++++++----- acpid.spec | 8 ++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index 97a5fbc..5877321 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -3,11 +3,11 @@ PATH=/sbin:/bin:/usr/bin # Check session status using systemd -session_ids=$(systemd-loginctl list-sessions 2>/dev/null | awk '{print $1}') +session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do - session_status=$(systemd-loginctl session-status ${session}) + session_status=$(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 + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded4\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit @@ -30,8 +30,10 @@ 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/) \ + $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || + $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || + $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || + $2 ~ /kded4/ || $3 ~ /guidance-power-manager/) \ { found = 1; exit } END { exit !found } ' || diff --git a/acpid.spec b/acpid.spec index 48acf95..3ab5aad 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -102,7 +102,7 @@ if [ "$1" = "2" ]; then if [ $RETCODE -eq 0 ]; then for i in $conflist; do rmdot=`echo $i | sed 's/.conf/conf/'` - mv $i $rmdot + mv $i $rmdot done fi fi @@ -125,6 +125,10 @@ fi %changelog +* Wed Nov 13 2013 Jaroslav Škarvada - 2.0.20-2 +- Fixed loginctl and added support for cinnamon and mate (patch by Leigh Scott) + Resolves: rhbz#1029868 + * Mon Sep 16 2013 Jaroslav Škarvada - 2.0.20-1 - New version Resolves: rhbz#1008344 From 2eb89b85eb89fa80330a67f139dfdd208acf88b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 13 Jan 2014 10:51:04 +0100 Subject: [PATCH 043/111] Use socket activation, fix rpmlint tabs vs spaces warnings. --- acpid.service | 15 ++++----------- acpid.socket | 9 +++++++++ acpid.spec | 21 +++++++++++++-------- 3 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 acpid.socket diff --git a/acpid.service b/acpid.service index 553b3e2..fef3569 100644 --- a/acpid.service +++ b/acpid.service @@ -1,18 +1,11 @@ [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. +Documentation=man:acpid(8) +Requires=acpid.socket [Service] -Type=forking EnvironmentFile=/etc/sysconfig/acpid -ExecStart=/usr/sbin/acpid $OPTIONS +ExecStart=/usr/sbin/acpid -f $OPTIONS [Install] -WantedBy=multi-user.target +Also=acpid.socket diff --git a/acpid.socket b/acpid.socket new file mode 100644 index 0000000..d61cba2 --- /dev/null +++ b/acpid.socket @@ -0,0 +1,9 @@ +[Unit] +Description=ACPID Listen Socket +Documentation=man:acpid(8) + +[Socket] +ListenStream=/var/run/acpid.socket + +[Install] +WantedBy=sockets.target diff --git a/acpid.spec b/acpid.spec index 3ab5aad..aaab828 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -18,6 +18,7 @@ Source3: acpid.power.conf Source4: acpid.power.sh Source5: acpid.service Source6: acpid.sysconfig +Source7: acpid.socket BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} URL: http://sourceforge.net/projects/acpid2/ @@ -63,7 +64,7 @@ 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 %{SOURCE5} %{SOURCE7} %{buildroot}/lib/systemd/system install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d @@ -78,6 +79,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc %{_docdir}/%{name} /lib/systemd/system/%{name}.service +/lib/systemd/system/%{name}.socket %dir %{_sysconfdir}/acpi %dir %{_sysconfdir}/acpi/events %dir %{_sysconfdir}/acpi/actions @@ -108,23 +110,26 @@ if [ "$1" = "2" ]; then fi %post -%systemd_post %{name}.service +%systemd_post %{name}.socket %{name}.service %preun -%systemd_preun %{name}.service +%systemd_preun %{name}.socket %{name}.service %postun -%systemd_postun_with_restart %{name}.service +%systemd_postun_with_restart %{name}.socket %{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 || : + /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 || : + /sbin/chkconfig --add acpid >/dev/null 2>&1 || : %changelog +* Fri Jan 10 2014 Ville Skyttä - 2.0.20-3 +- Use socket activation, fix rpmlint tabs vs spaces warnings. + * Wed Nov 13 2013 Jaroslav Škarvada - 2.0.20-2 - Fixed loginctl and added support for cinnamon and mate (patch by Leigh Scott) Resolves: rhbz#1029868 From 49844a6a171152652efed5174306c015b610328f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 12 Feb 2014 17:11:37 +0100 Subject: [PATCH 044/111] New version Resolves: rhbz#1054057 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index aaab828..33662c5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.20 -Release: 3%{?dist} +Version: 2.0.21 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,10 @@ fi %changelog +* Wed Feb 12 2014 Jaroslav Škarvada - 2.0.21-1 +- New version + Resolves: rhbz#1054057 + * Fri Jan 10 2014 Ville Skyttä - 2.0.20-3 - Use socket activation, fix rpmlint tabs vs spaces warnings. diff --git a/sources b/sources index 9fd6959..910ee06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b740e6419cf45aaeb2bd78d589f27f9 acpid-2.0.20.tar.xz +252bb4b3a8053227e743e267d98b8a52 acpid-2.0.21.tar.xz From f204b402a2b1cec476290ecb64df84e1abff73ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 18 Feb 2014 10:34:56 +0100 Subject: [PATCH 045/111] Used unitdir macro instead of the hardcoded systemd paths --- acpid.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/acpid.spec b/acpid.spec index 33662c5..b0e9b8a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.21 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -57,14 +57,14 @@ make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/acpi/events mkdir -p %{buildroot}%{_sysconfdir}/acpi/actions -mkdir -p %{buildroot}/lib/systemd/system +mkdir -p %{buildroot}%{_unitdir} 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} %{SOURCE7} %{buildroot}/lib/systemd/system +install -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d @@ -78,8 +78,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc %{_docdir}/%{name} -/lib/systemd/system/%{name}.service -/lib/systemd/system/%{name}.socket +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.socket %dir %{_sysconfdir}/acpi %dir %{_sysconfdir}/acpi/events %dir %{_sysconfdir}/acpi/actions @@ -127,6 +127,9 @@ fi %changelog +* Tue Feb 18 2014 Jaroslav Škarvada - 2.0.21-2 +- Used unitdir macro instead of the hardcoded systemd paths + * Wed Feb 12 2014 Jaroslav Škarvada - 2.0.21-1 - New version Resolves: rhbz#1054057 From b0b6610102512324036478c930b25b2ad5bef9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Mar 2014 10:36:01 +0100 Subject: [PATCH 046/111] New version --- acpid.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index b0e9b8a..110fd75 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.21 -Release: 2%{?dist} +Version: 2.0.22 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,9 @@ fi %changelog +* Mon Mar 17 2014 Jaroslav Škarvada - 2.0.22-1 +- New version + * Tue Feb 18 2014 Jaroslav Škarvada - 2.0.21-2 - Used unitdir macro instead of the hardcoded systemd paths diff --git a/sources b/sources index 910ee06..ca64e56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -252bb4b3a8053227e743e267d98b8a52 acpid-2.0.21.tar.xz +c8ba756030d1b21fc973ec3d640f27f1 acpid-2.0.22.tar.xz From ec5fa3947f4fa95b72a233ed52d1a707a1223a65 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 23 May 2014 12:44:28 -0500 Subject: [PATCH 047/111] enable building on aarch64 and 32 bit arm --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 110fd75..f3e0bd2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.22 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -20,7 +20,7 @@ Source5: acpid.service Source6: acpid.sysconfig Source7: acpid.socket BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: ia64 x86_64 %{ix86} +ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd Requires(post): systemd @@ -127,6 +127,9 @@ fi %changelog +* Fri May 23 2014 Dennis Gilmore - 2.0.22-2 +- enable building on aarch64 and 32 bit arm + * Mon Mar 17 2014 Jaroslav Škarvada - 2.0.22-1 - New version From fb241c6c5c6f98fecfe7662a33e9ec5476126d25 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:04:07 -0500 Subject: [PATCH 048/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index f3e0bd2..6ad2fe5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.22 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 Dennis Gilmore - 2.0.22-2 - enable building on aarch64 and 32 bit arm From 3f41ca1dd7bfb74ea4eaebd9edcb06beae3d0537 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 19:58:15 +0000 Subject: [PATCH 049/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 6ad2fe5..2aff386 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.22 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,9 @@ fi %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.0.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.0.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 31f6dc352530eed2db43bea74046c06458af3f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 26 Aug 2014 10:46:48 +0200 Subject: [PATCH 050/111] New version Resolves: rhbz#1133263 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 2aff386..63f1897 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.22 -Release: 4%{?dist} +Version: 2.0.23 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,10 @@ fi %changelog +* Tue Aug 26 2014 Jaroslav Škarvada - 2.0.23-1 +- New version + Resolves: rhbz#1133263 + * Fri Aug 15 2014 Fedora Release Engineering - 2.0.22-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index ca64e56..e6f8f81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8ba756030d1b21fc973ec3d640f27f1 acpid-2.0.22.tar.xz +d7bcdcdefcd53b03730e50ba842554ea acpid-2.0.23.tar.xz From d3a7415c18f90288e84fb42d161f525ecc30120d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 Mar 2015 14:23:44 -0500 Subject: [PATCH 051/111] Drop sysvinit subpackage in F23+ --- acpid.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 63f1897..850f05a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -32,6 +32,7 @@ Requires: systemd %description acpid is a daemon that dispatches ACPI events to user-space programs. +%if 0%{?fedora} < 23 %package sysvinit Summary: ACPI Event Daemon Group: System Environment/Daemons @@ -40,6 +41,7 @@ Requires(preun): /sbin/service %description sysvinit The acpid-sysvinit contains SysV initscript. +%endif %prep %setup -q @@ -67,8 +69,10 @@ install -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh install -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid +%if 0%{?fedora} < 23 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid +%endif %clean @@ -94,8 +98,10 @@ rm -rf %{buildroot} %{_mandir}/man8/acpi_listen.8.gz %{_mandir}/man8/kacpimon.8.gz +%if 0%{?fedora} < 23 %files sysvinit %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid +%endif %pre if [ "$1" = "2" ]; then @@ -122,11 +128,16 @@ fi /sbin/chkconfig --del acpid >/dev/null 2>&1 || : /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : +%if 0%{?fedora} < 23 %triggerpostun -n %{name}-sysvinit -- %{name} < 2.0.10-2 /sbin/chkconfig --add acpid >/dev/null 2>&1 || : +%endif %changelog +* Thu Mar 05 2015 Adam Jackson 2.0.23-2 +- Drop sysvinit subpackage in F23+ + * Tue Aug 26 2014 Jaroslav Škarvada - 2.0.23-1 - New version Resolves: rhbz#1133263 From 57bfcdb787eb3b31b8c9d5d21317ac5958485c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 19 May 2015 12:08:06 +0200 Subject: [PATCH 052/111] Changed PATH to /usr/sbin:/usr/bin in power.sh Resolves: rhbz#1192817 --- acpid.power.sh | 2 +- acpid.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index 5877321..5e0da13 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -1,6 +1,6 @@ #!/bin/sh -PATH=/sbin:/bin:/usr/bin +PATH=/usr/sbin:/usr/bin # Check session status using systemd session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') diff --git a/acpid.spec b/acpid.spec index 850f05a..b47b74d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Tue May 19 2015 Jaroslav Škarvada - 2.0.23-3 +- Changed PATH to /usr/sbin:/usr/bin in power.sh + Resolves: rhbz#1192817 + * Thu Mar 05 2015 Adam Jackson 2.0.23-2 - Drop sysvinit subpackage in F23+ From 60e8ba8c00c22fc19be2f7da385832d09671c287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Jun 2015 10:17:24 +0200 Subject: [PATCH 053/111] Used socket for stdin to support socket activation --- acpid.service | 1 + acpid.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/acpid.service b/acpid.service index fef3569..e7d0987 100644 --- a/acpid.service +++ b/acpid.service @@ -4,6 +4,7 @@ Documentation=man:acpid(8) Requires=acpid.socket [Service] +StandardInput=socket EnvironmentFile=/etc/sysconfig/acpid ExecStart=/usr/sbin/acpid -f $OPTIONS diff --git a/acpid.spec b/acpid.spec index b47b74d..04efe64 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Tue Jun 2 2015 Jaroslav Škarvada - 2.0.23-4 +- Used socket for stdin to support socket activation + * Tue May 19 2015 Jaroslav Škarvada - 2.0.23-3 - Changed PATH to /usr/sbin:/usr/bin in power.sh Resolves: rhbz#1192817 From 85e74bac860e18c2e4f996ca21a885dd689eeadb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:35:38 +0000 Subject: [PATCH 054/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 04efe64..bee936e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.0.23-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Jun 2 2015 Jaroslav Škarvada - 2.0.23-4 - Used socket for stdin to support socket activation From ba574e01a249d4dcac14008656b55a33ad442114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Aug 2015 12:06:41 +0200 Subject: [PATCH 055/111] New version Resolves: rhbz#1253985 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index bee936e..bfb26c6 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.23 -Release: 5%{?dist} +Version: 2.0.25 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Mon Aug 17 2015 Jaroslav Škarvada - 2.0.25-1 +- New version + Resolves: rhbz#1253985 + * Tue Jun 16 2015 Fedora Release Engineering - 2.0.23-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index e6f8f81..6e7e24f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7bcdcdefcd53b03730e50ba842554ea acpid-2.0.23.tar.xz +69bb0cc4a0a89eb2dfecc4851087f568 acpid-2.0.25.tar.xz From 48dcc21e3f191ad8dab268b88de09f0381f38f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 2 Sep 2015 12:32:48 +0200 Subject: [PATCH 056/111] Simplified macros check related to hardening --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index bfb26c6..f14b512 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,14 +1,14 @@ # hardened build if not overrided %{!?_hardened_build:%global _hardened_build 1} -%if %{?_hardened_build:%{_hardened_build}}%{!?_hardened_build:0} +%if %{?_hardened_build}%{!?_hardened_build:0} %global harden -pie -Wl,-z,relro,-z,now %endif Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-2 +- Simplified macros check related to hardening + * Mon Aug 17 2015 Jaroslav Škarvada - 2.0.25-1 - New version Resolves: rhbz#1253985 From b858e2c776ad28314ff36820e026ba1bfe1875b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 2 Sep 2015 14:04:50 +0200 Subject: [PATCH 057/111] Fixed typo --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index f14b512..d79add2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,4 +1,4 @@ -# hardened build if not overrided +# hardened build if not overridden %{!?_hardened_build:%global _hardened_build 1} %if %{?_hardened_build}%{!?_hardened_build:0} @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-3 +- Fixed typo + * Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-2 - Simplified macros check related to hardening From 006f2bba367e3a5817551996bdc88c846eb84541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 12 Nov 2015 12:08:29 +0100 Subject: [PATCH 058/111] Preserve timestamps on installed files --- acpid.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/acpid.spec b/acpid.spec index d79add2..4b2f478 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -63,15 +63,15 @@ mkdir -p %{buildroot}%{_unitdir} 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} %{SOURCE7} %{buildroot}%{_unitdir} -install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid +install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/acpi/events/videoconf +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/acpi/events/powerconf +install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh +install -p -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid %if 0%{?fedora} < 23 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid +install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif @@ -135,6 +135,9 @@ fi %changelog +* Thu Nov 12 2015 Jaroslav Škarvada - 2.0.25-4 +- Preserve timestamps on installed files + * Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-3 - Fixed typo From 2f2c4e57a46fbc596c895e3f2453628f7926711b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:57:53 +0000 Subject: [PATCH 059/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4b2f478..2d84980 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.0.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Nov 12 2015 Jaroslav Škarvada - 2.0.25-4 - Preserve timestamps on installed files From e05633f800692569b41aec4020c002444c3d7a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 16 Mar 2016 10:07:17 +0100 Subject: [PATCH 060/111] New version Resolves: rhbz#1299109 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 2d84980..2b946a7 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.25 -Release: 5%{?dist} +Version: 2.0.27 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Mar 16 2016 Jaroslav Škarvada - 2.0.27-1 +- New version + Resolves: rhbz#1299109 + * Wed Feb 03 2016 Fedora Release Engineering - 2.0.25-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 6e7e24f..c784f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69bb0cc4a0a89eb2dfecc4851087f568 acpid-2.0.25.tar.xz +e41bdf628e122edb4342fca432ea7db9 acpid-2.0.27.tar.xz From bc5c27a9dfd60cabe71396f670c5ff4747705eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Jul 2016 16:08:34 +0200 Subject: [PATCH 061/111] Added exception for kded5 to power.sh Resolves: rhbz#1319885 --- acpid.power.sh | 4 ++-- acpid.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index 5e0da13..d6b4c75 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -7,7 +7,7 @@ session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do session_status=$(loginctl session-status ${session}) echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded4\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit @@ -33,7 +33,7 @@ awk ' $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || - $2 ~ /kded4/ || $3 ~ /guidance-power-manager/) \ + $2 ~ /kded[4-5]/ || $3 ~ /guidance-power-manager/) \ { found = 1; exit } END { exit !found } ' || diff --git a/acpid.spec b/acpid.spec index 2b946a7..bae67f5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-2 +- Added exception for kded5 to power.sh + Resolves: rhbz#1319885 + * Wed Mar 16 2016 Jaroslav Škarvada - 2.0.27-1 - New version Resolves: rhbz#1299109 From 4e1e546e4d4bb9d32d82e82236bd932ea6f88648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Jul 2016 16:58:29 +0200 Subject: [PATCH 062/111] Added exception for plasmashell to power.sh Related: rhbz#1319885 --- acpid.power.sh | 11 ++++++----- acpid.spec | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index d6b4c75..db59f90 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -7,7 +7,7 @@ session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do session_status=$(loginctl session-status ${session}) echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit @@ -29,12 +29,13 @@ active == "TRUE" && x11 != "" { ps axo uid,cmd | \ awk ' $1 == '$uid_session' && - ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || + ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || - $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || - $2 ~ /kded[4-5]/ || $3 ~ /guidance-power-manager/) \ - { found = 1; exit } + $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || + $2 ~ /kded[4-5]/ || $2 ~ /guidance-power-manager/ || + $2 ~ /plasmashell/) \ + { found = 1; exit } END { exit !found } ' || shutdown -h now diff --git a/acpid.spec b/acpid.spec index bae67f5..639490d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-3 +- Added exception for plasmashell to power.sh + Related: rhbz#1319885 + * Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-2 - Added exception for kded5 to power.sh Resolves: rhbz#1319885 From b6040032e56b5334a5edbb634cf2a300c9ffa2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 3 Aug 2016 17:00:20 +0200 Subject: [PATCH 063/111] Fixed service autostart (if enabled) Resolves: rhbz#1363632 --- acpid.service | 1 + acpid.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/acpid.service b/acpid.service index e7d0987..56e2c55 100644 --- a/acpid.service +++ b/acpid.service @@ -10,3 +10,4 @@ ExecStart=/usr/sbin/acpid -f $OPTIONS [Install] Also=acpid.socket +WantedBy=multi-user.target diff --git a/acpid.spec b/acpid.spec index 639490d..5ff28b3 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Aug 3 2016 Jaroslav Škarvada - 2.0.27-4 +- Fixed service autostart (if enabled) + Resolves: rhbz#1363632 + * Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-3 - Added exception for plasmashell to power.sh Related: rhbz#1319885 From ce6e405603c27a6fa6cc11f0968d1e1049b580c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 16 Sep 2016 12:36:11 +0200 Subject: [PATCH 064/111] New version Resolves: rhbz#1376618 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 5ff28b3..fe89007 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.27 -Release: 4%{?dist} +Version: 2.0.28 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Fri Sep 16 2016 Jaroslav Škarvada - 2.0.28-1 +- New version + Resolves: rhbz#1376618 + * Wed Aug 3 2016 Jaroslav Škarvada - 2.0.27-4 - Fixed service autostart (if enabled) Resolves: rhbz#1363632 diff --git a/sources b/sources index c784f2c..1111511 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e41bdf628e122edb4342fca432ea7db9 acpid-2.0.27.tar.xz +0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz From b490262b76d5497f75b75dcac5f47f8dbbfa5bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Wed, 18 Jan 2017 16:36:30 +0100 Subject: [PATCH 065/111] Fixed obtaining process list in power.sh to avoid SELinux denials Resolves: rhbz#1408457 --- acpid.power.sh | 13 ++++++++++--- acpid.spec | 6 +++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index db59f90..f1ef088 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -2,12 +2,19 @@ PATH=/usr/sbin:/usr/bin +# $1 = session number +function get_session_processes() { + local uid=$(loginctl show-session $1 | grep '^User=' | sed -r -e 's/^User=(.*)$/\1/') + systemd-cgls "/user.slice/user-${uid}.slice/session-${1}.scope" +} + # Check session status using systemd session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do - session_status=$(loginctl session-status ${session}) - echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + session_status=$(loginctl show-session ${session}) + session_processes="$(get_session_processes ${session})" + echo "${session_status}" | grep -e 'Active=yes' &> /dev/null && + echo "${session_processes}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit diff --git a/acpid.spec b/acpid.spec index fe89007..5cbe054 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jan 18 2017 Ondřej Lysoněk - 2.0.28-2 +- Fixed obtaining process list in power.sh to avoid SELinux denials + Resolves: rhbz#1408457 + * Fri Sep 16 2016 Jaroslav Škarvada - 2.0.28-1 - New version Resolves: rhbz#1376618 From a0067e585880ef3c4ed7e941fa40abebde50e49e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:43:47 +0000 Subject: [PATCH 066/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 5cbe054..cf34fa7 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Jan 18 2017 Ondřej Lysoněk - 2.0.28-2 - Fixed obtaining process list in power.sh to avoid SELinux denials Resolves: rhbz#1408457 From f903e46c7390f7795eea6310fbbce82a1a0d061f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:34:18 +0000 Subject: [PATCH 067/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index cf34fa7..1c1c242 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.28-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.0.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 069fd7bde61281aa7fca211a5729378d32404bfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:23:17 +0000 Subject: [PATCH 068/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 1c1c242..7506aaf 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.0.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.0.28-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 72d5fa1fe13bff6dedf91ae5bedb84bf8c22179f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 31 Aug 2017 13:48:39 +0200 Subject: [PATCH 069/111] Switched kacpimon to dynamic connections (increased max connections from 20 to 1024) Resolves: rhbz#1450980 Consolidated new line delimiters --- ...-2.0.28-kacpimon-dynamic-connections.patch | 131 ++++++++++++++++++ acpid.spec | 17 ++- 2 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 acpid-2.0.28-kacpimon-dynamic-connections.patch diff --git a/acpid-2.0.28-kacpimon-dynamic-connections.patch b/acpid-2.0.28-kacpimon-dynamic-connections.patch new file mode 100644 index 0000000..b17dcbc --- /dev/null +++ b/acpid-2.0.28-kacpimon-dynamic-connections.patch @@ -0,0 +1,131 @@ +diff --git a/kacpimon/connection_list.c b/kacpimon/connection_list.c +index 9b0b0a8..f228186 100644 +--- a/kacpimon/connection_list.c ++++ b/kacpimon/connection_list.c +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + #include "connection_list.h" + +@@ -30,9 +31,9 @@ + /*---------------------------------------------------------------*/ + /* private objects */ + +-#define MAX_CONNECTIONS 20 ++static int capacity = 0; + +-static struct connection connection_list[MAX_CONNECTIONS]; ++static struct connection *connection_list = NULL; + + static int nconnections = 0; + +@@ -51,9 +52,19 @@ add_connection(struct connection *p) + { + if (nconnections < 0) + return; +- if (nconnections >= MAX_CONNECTIONS) { +- printf("add_connection(): Too many connections.\n"); +- return; ++ ++ /* if the list is full, allocate more space */ ++ if (nconnections >= capacity) { ++ /* no more than 1024 */ ++ if (capacity > 1024) { ++ printf("add_connection(): Too many connections.\n"); ++ return; ++ } ++ ++ /* another 20 */ ++ capacity += 20; ++ connection_list = ++ realloc(connection_list, sizeof(struct connection) * capacity); + } + + if (nconnections == 0) +@@ -70,6 +81,30 @@ add_connection(struct connection *p) + + /*---------------------------------------------------------------*/ + ++void ++delete_all_connections(void) ++{ ++ int i = 0; ++ ++ /* For each connection */ ++ for (i = 0; i <= get_number_of_connections(); ++i) ++ { ++ struct connection *p; ++ ++ p = get_connection(i); ++ ++ /* If this connection is invalid, try the next. */ ++ if (p == 0) ++ continue; ++ ++ close(p -> fd); ++ } ++ free(connection_list); ++ connection_list = NULL; ++} ++ ++/*---------------------------------------------------------------*/ ++ + struct connection * + find_connection(int fd) + { +diff --git a/kacpimon/connection_list.h b/kacpimon/connection_list.h +index 1d037cf..a787637 100644 +--- a/kacpimon/connection_list.h ++++ b/kacpimon/connection_list.h +@@ -56,4 +56,7 @@ extern const fd_set *get_fdset(void); + /* get the highest fd that was added to the list */ + extern int get_highestfd(void); + ++/* delete all connections, closing the fds */ ++extern void delete_all_connections(void); ++ + #endif /* CONNECTION_LIST_H__ */ +diff --git a/kacpimon/kacpimon.c b/kacpimon/kacpimon.c +index 1ddb9aa..253d270 100644 +--- a/kacpimon/kacpimon.c ++++ b/kacpimon/kacpimon.c +@@ -164,27 +164,6 @@ static void monitor(void) + + // --------------------------------------------------------------- + +-static void close_all(void) +-{ +- int i = 0; +- +- /* For each connection */ +- for (i = 0; i <= get_number_of_connections(); ++i) +- { +- struct connection *p; +- +- p = get_connection(i); +- +- /* If this connection is invalid, try the next. */ +- if (p == 0) +- continue; +- +- close(p -> fd); +- } +-} +- +-// --------------------------------------------------------------- +- + int main(void) + { + printf("Kernel ACPI Event Monitor...\n"); +@@ -199,7 +178,7 @@ int main(void) + + printf("Closing files...\n"); + +- close_all(); ++ delete_all_connections(); + + printf("Goodbye\n"); + diff --git a/acpid.spec b/acpid.spec index 7506aaf..4582d0a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -19,6 +19,8 @@ Source4: acpid.power.sh Source5: acpid.service Source6: acpid.sysconfig Source7: acpid.socket +# https://sourceforge.net/p/acpid2/tickets/14/ +Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ @@ -28,7 +30,6 @@ Requires(preun): systemd Requires(postun): systemd Requires: systemd - %description acpid is a daemon that dispatches ACPI events to user-space programs. @@ -45,13 +46,12 @@ The acpid-sysvinit contains SysV initscript. %prep %setup -q - +%patch0 -p1 -b .kacpimon-dynamic-connections %build %configure make %{?_smp_mflags} CFLAGS="%{optflags} %{?harden}" - %install rm -rf %{buildroot} mkdir -p %{buildroot} @@ -74,11 +74,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif - %clean rm -rf %{buildroot} - %files %defattr(-,root,root) %doc %{_docdir}/%{name} @@ -133,8 +131,13 @@ fi /sbin/chkconfig --add acpid >/dev/null 2>&1 || : %endif - %changelog +* Thu Aug 31 2017 Jaroslav Škarvada - 2.0.28-6 +- Switched kacpimon to dynamic connections (increased max connections + from 20 to 1024) + Resolves: rhbz#1450980 +- Consolidated new line delimiters + * Wed Aug 02 2017 Fedora Release Engineering - 2.0.28-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 9ac9e398912889a2aaa849b65f5de031b499e5c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:49:44 +0000 Subject: [PATCH 070/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4582d0a..967d26d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -132,6 +132,9 @@ fi %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.28-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 31 2017 Jaroslav Škarvada - 2.0.28-6 - Switched kacpimon to dynamic connections (increased max connections from 20 to 1024) From 256c4c128601017f1081634d8458e31c7c813179 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:00:54 +0100 Subject: [PATCH 071/111] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- acpid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 967d26d..8b20158 100644 --- a/acpid.spec +++ b/acpid.spec @@ -21,7 +21,6 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd From 1b45fb15f2af6a7124a5fb62042431bd656a2647 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:01:33 +0100 Subject: [PATCH 072/111] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- acpid.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 8b20158..3f0f2bb 100644 --- a/acpid.spec +++ b/acpid.spec @@ -73,9 +73,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc %{_docdir}/%{name} From 37a02914b2f8d57e518b89ad387a8a9cbbaf5104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Mon, 19 Feb 2018 14:30:36 +0100 Subject: [PATCH 073/111] Add gcc to BuildRequires --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 3f0f2bb..c30680a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -23,7 +23,7 @@ Source7: acpid.socket Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ -BuildRequires: systemd +BuildRequires: systemd, gcc Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -128,6 +128,9 @@ fi %endif %changelog +* Mon Feb 19 2018 Ondřej Lysoněk - 2.0.28-8 +- Add gcc to BuildRequires + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.28-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d2070d836db71fb80905ea91660e22a2c83258be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 19 Apr 2018 14:23:37 +0200 Subject: [PATCH 074/111] New version Resolves: rhbz#1568392 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index c30680a..dc97309 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.28 -Release: 8%{?dist} +Version: 2.0.29 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -128,6 +128,10 @@ fi %endif %changelog +* Thu Apr 19 2018 Jaroslav Škarvada - 2.0.29-1 +- New version + Resolves: rhbz#1568392 + * Mon Feb 19 2018 Ondřej Lysoněk - 2.0.28-8 - Add gcc to BuildRequires diff --git a/sources b/sources index 1111511..0ef9641 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz +SHA512 (acpid-2.0.29.tar.xz) = 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17 From f0ea4bd48a552f6126d2ce16a397e8c4fd51460c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:09:19 -0500 Subject: [PATCH 075/111] Remove needless use of %defattr --- acpid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index dc97309..5310ff2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -74,7 +74,6 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif %files -%defattr(-,root,root) %doc %{_docdir}/%{name} %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket From c53f57b00ca81d5baa03988196a67bbf73d64114 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:57:58 +0000 Subject: [PATCH 076/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 5310ff2..9749858 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.29 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,9 @@ fi %endif %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Apr 19 2018 Jaroslav Škarvada - 2.0.29-1 - New version Resolves: rhbz#1568392 From 6ed003a6ba0c22bd103f088522956b24585ce77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 19 Jul 2018 16:56:19 +0200 Subject: [PATCH 077/111] New version Resolves: rhbz#1602974 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 9749858..ec83033 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.29 -Release: 2%{?dist} +Version: 2.0.30 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,10 @@ fi %endif %changelog +* Thu Jul 19 2018 Jaroslav Škarvada - 2.0.30-1 +- New version + Resolves: rhbz#1602974 + * Thu Jul 12 2018 Fedora Release Engineering - 2.0.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 0ef9641..83b2a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.29.tar.xz) = 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17 +SHA512 (acpid-2.0.30.tar.xz) = 6901e93cc626817b782e43976caf4b7f89e8c4275eb7e9d31aeeb967b5d5bbb6a2b4dcf71e72ba666e10343cdbdbe8528feee955af5ba14de8ec88ef61b29f96 From 5c1d578003d2b85c868bd305a3b335083c57108e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Nov 2018 11:51:29 +0100 Subject: [PATCH 078/111] Dropped sysvinit support --- acpid.init | 115 ----------------------------------------------------- acpid.spec | 32 ++------------- 2 files changed, 4 insertions(+), 143 deletions(-) delete mode 100755 acpid.init diff --git a/acpid.init b/acpid.init deleted file mode 100755 index 0ddab7a..0000000 --- a/acpid.init +++ /dev/null @@ -1,115 +0,0 @@ -#!/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/acpid.spec b/acpid.spec index ec83033..429f335 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,11 +8,10 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.30 -Release: 1%{?dist} +Release: 2%{?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 @@ -32,17 +31,6 @@ Requires: systemd %description acpid is a daemon that dispatches ACPI events to user-space programs. -%if 0%{?fedora} < 23 -%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. -%endif - %prep %setup -q %patch0 -p1 -b .kacpimon-dynamic-connections @@ -68,11 +56,6 @@ install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh install -p -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid -%if 0%{?fedora} < 23 -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d -install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid -%endif - %files %doc %{_docdir}/%{name} %{_unitdir}/%{name}.service @@ -91,11 +74,6 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %{_mandir}/man8/acpi_listen.8.gz %{_mandir}/man8/kacpimon.8.gz -%if 0%{?fedora} < 23 -%files sysvinit -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid -%endif - %pre if [ "$1" = "2" ]; then conflist=`ls %{_sysconfdir}/acpi/events/*.conf 2> /dev/null` @@ -121,12 +99,10 @@ fi /sbin/chkconfig --del acpid >/dev/null 2>&1 || : /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : -%if 0%{?fedora} < 23 -%triggerpostun -n %{name}-sysvinit -- %{name} < 2.0.10-2 - /sbin/chkconfig --add acpid >/dev/null 2>&1 || : -%endif - %changelog +* Thu Nov 15 2018 Jaroslav Škarvada - 2.0.30-2 +- Dropped sysvinit support + * Thu Jul 19 2018 Jaroslav Škarvada - 2.0.30-1 - New version Resolves: rhbz#1602974 From e19881df7a342bbb4e510ce65e28126897a268d6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 079/111] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- acpid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 429f335..77ddfaf 100644 --- a/acpid.spec +++ b/acpid.spec @@ -10,7 +10,6 @@ Name: acpid Version: 2.0.30 Release: 2%{?dist} License: GPLv2+ -Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf Source3: acpid.power.conf From 79cdab6734028bcdf49309266693b13ba54bed26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:55:24 +0000 Subject: [PATCH 080/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 77ddfaf..70e5161 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.30 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Nov 15 2018 Jaroslav Škarvada - 2.0.30-2 - Dropped sysvinit support From a17a13a4daff5e50f4d9cdce2162dd583e4e3575 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:30:39 +0000 Subject: [PATCH 081/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 70e5161..15a2069 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.30 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.0.30-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From efb293c090648c7600af2ae9b6fedc20b177e6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 20 Aug 2019 17:58:16 +0200 Subject: [PATCH 082/111] New version Resolves: rhbz#1742776 --- ... => acpid-2.0.32-kacpimon-dynamic-connections.patch | 2 +- acpid.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename acpid-2.0.28-kacpimon-dynamic-connections.patch => acpid-2.0.32-kacpimon-dynamic-connections.patch (99%) diff --git a/acpid-2.0.28-kacpimon-dynamic-connections.patch b/acpid-2.0.32-kacpimon-dynamic-connections.patch similarity index 99% rename from acpid-2.0.28-kacpimon-dynamic-connections.patch rename to acpid-2.0.32-kacpimon-dynamic-connections.patch index b17dcbc..2cd2a7c 100644 --- a/acpid-2.0.28-kacpimon-dynamic-connections.patch +++ b/acpid-2.0.32-kacpimon-dynamic-connections.patch @@ -14,7 +14,7 @@ index 9b0b0a8..f228186 100644 /*---------------------------------------------------------------*/ /* private objects */ --#define MAX_CONNECTIONS 20 +-#define MAX_CONNECTIONS 100 +static int capacity = 0; -static struct connection connection_list[MAX_CONNECTIONS]; diff --git a/acpid.spec b/acpid.spec index 15a2069..ddf45c4 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.30 -Release: 4%{?dist} +Version: 2.0.32 +Release: 1%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -18,7 +18,7 @@ Source5: acpid.service Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ -Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch +Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc @@ -99,6 +99,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Aug 20 2019 Jaroslav Škarvada - 2.0.32-1 +- New version + Resolves: rhbz#1742776 + * Wed Jul 24 2019 Fedora Release Engineering - 2.0.30-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 075dc864fbb205c963cce248a6e3fc567cf11c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 20 Aug 2019 17:59:00 +0200 Subject: [PATCH 083/111] Added sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 83b2a32..f098da6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.30.tar.xz) = 6901e93cc626817b782e43976caf4b7f89e8c4275eb7e9d31aeeb967b5d5bbb6a2b4dcf71e72ba666e10343cdbdbe8528feee955af5ba14de8ec88ef61b29f96 +SHA512 (acpid-2.0.32.tar.xz) = c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7 From cc2fe697f81347198c147cca721c27b78448adfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:10:34 +0000 Subject: [PATCH 084/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index ddf45c4..e91d866 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 20 2019 Jaroslav Škarvada - 2.0.32-1 - New version Resolves: rhbz#1742776 From ccc98ef2a6dfeefe95d2d857e572e5c410db86f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:42:51 +0000 Subject: [PATCH 085/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index e91d866..507e22a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.32-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 552dd0cbd2bd00b3517cf43d59e358d0b4fe5bb1 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:44:48 +0000 Subject: [PATCH 086/111] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- acpid.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/acpid.spec b/acpid.spec index 507e22a..8edbe84 100644 --- a/acpid.spec +++ b/acpid.spec @@ -22,6 +22,7 @@ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc +BuildRequires: make Requires(post): systemd Requires(preun): systemd Requires(postun): systemd From 1ae2c03c1246e88c046641d069b8358a7129228b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:46:34 +0000 Subject: [PATCH 087/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 8edbe84..8cc6a10 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.0.32-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a573c3caf52c18143c0926c1e5a0b69db788b8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:12 +0100 Subject: [PATCH 088/111] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- acpid.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 8cc6a10..af3ad6e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0.32-5 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Jan 25 2021 Fedora Release Engineering - 2.0.32-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2e4aabe2b80f12380d9d5e63ee59d610c5177382 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 1 Jul 2021 10:40:20 -0400 Subject: [PATCH 089/111] Use /run for acpid.socket path --- acpid.socket | 2 +- acpid.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.socket b/acpid.socket index d61cba2..2f2770a 100644 --- a/acpid.socket +++ b/acpid.socket @@ -3,7 +3,7 @@ Description=ACPID Listen Socket Documentation=man:acpid(8) [Socket] -ListenStream=/var/run/acpid.socket +ListenStream=/run/acpid.socket [Install] WantedBy=sockets.target diff --git a/acpid.spec b/acpid.spec index af3ad6e..a16e725 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Jul 01 2021 FeRD (Frank Dana) - 2.0.32-6 +- Updated socket path from /var/run => /run in acpid.socket + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0.32-5 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 2031b55b58d17ef8eb8b35ac5723ccb6d9b21a84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:18:40 +0000 Subject: [PATCH 090/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 3483164c0a7c164e6740becfa871fe1f5ecb745b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:13:48 +0000 Subject: [PATCH 091/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index a16e725..f9977f2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.32-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 01 2021 FeRD (Frank Dana) - 2.0.32-6 - Updated socket path from /var/run => /run in acpid.socket From 20fe56fd611b84e82ff2620ce9248800c2955139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 5 Oct 2021 21:16:25 +0200 Subject: [PATCH 092/111] New version Resolves: rhbz#2004773 --- .gitignore | 2 +- acpid.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e484e16..8818959 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -acpid-*.tar.xz +/acpid-*.tar.xz diff --git a/acpid.spec b/acpid.spec index f9977f2..3550f63 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.32 -Release: 7%{?dist} +Version: 2.0.33 +Release: 1%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Oct 5 2021 Jaroslav Škarvada - 2.0.33-1 +- New version + Resolves: rhbz#2004773 + * Wed Jul 21 2021 Fedora Release Engineering - 2.0.32-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index f098da6..ebfff6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.32.tar.xz) = c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7 +SHA512 (acpid-2.0.33.tar.xz) = 491a58c62fcad44dc57cbd9294437fbc215c2ec99a030286601cd1956ea504e723e61b11b315983073d66aace1997bc40e6421475f6073298f60b8dcda2add75 From 26ac1b85064695551a9bd6f29e05cee93d4f08d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:53:53 +0000 Subject: [PATCH 093/111] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 3550f63..4ce9969 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.33 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Oct 5 2021 Jaroslav Škarvada - 2.0.33-1 - New version Resolves: rhbz#2004773 From b8fd36d6f693d859f987473fff5bad23a03344ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:24:35 +0000 Subject: [PATCH 094/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4ce9969..b56e5bf 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.33 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bee1f356ab645e9751dcbc361eeb73a3e6b486e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 24 Sep 2022 17:58:42 +0200 Subject: [PATCH 095/111] New version Resolves: rhbz#2127331 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index b56e5bf..7352257 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.33 -Release: 3%{?dist} +Version: 2.0.34 +Release: 1%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Sat Sep 24 2022 Jaroslav Škarvada - 2.0.34-1 +- New version + Resolves: rhbz#2127331 + * Wed Jul 20 2022 Fedora Release Engineering - 2.0.33-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index ebfff6d..7ca6fe8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.33.tar.xz) = 491a58c62fcad44dc57cbd9294437fbc215c2ec99a030286601cd1956ea504e723e61b11b315983073d66aace1997bc40e6421475f6073298f60b8dcda2add75 +SHA512 (acpid-2.0.34.tar.xz) = 2bf92295b55bb44fe83074b3e0c1ae639f63edaeea84b2184ae95b38852be40f380d5413110b8c0fcb2efc2ec01bf4764e1dcb97022fc724bebbfc35c0b63c81 From 041abd75fe7b3d0dc41bbd27b92784d74ca772f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:22:02 +0000 Subject: [PATCH 096/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 7352257..78068a2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Sep 24 2022 Jaroslav Škarvada - 2.0.34-1 - New version Resolves: rhbz#2127331 From bb00419669d16d69942bb4885d994fd867cbf8f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:52:22 +0000 Subject: [PATCH 097/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 78068a2..7b51ebc 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.34-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.0.34-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From aa0b1dad7e4eca6ed38e5f64d76ca46af69e9403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 9 Aug 2023 16:34:25 +0200 Subject: [PATCH 098/111] Converted license to SPDX --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 7b51ebc..ebb1945 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,8 +8,8 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 3%{?dist} -License: GPLv2+ +Release: 4%{?dist} +License: GPL-2.0-or-later AND X11 Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf Source3: acpid.power.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-4 +- Converted license to SPDX + * Wed Jul 19 2023 Fedora Release Engineering - 2.0.34-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9af6a96e883b7cb6ddc40052c2a6420a61aea53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 9 Aug 2023 21:24:09 +0200 Subject: [PATCH 099/111] Fixed SPDX license MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index ebb1945..b265fc0 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,8 +8,8 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 4%{?dist} -License: GPL-2.0-or-later AND X11 +Release: 5%{?dist} +License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf Source3: acpid.power.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-5 +- SPDX license fix + * Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-4 - Converted license to SPDX From 480ff5d8c15c47d8ad85b991a92de8a3fc63e748 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:06:46 +0000 Subject: [PATCH 100/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index b265fc0..4b4b2ec 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.34-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-5 - SPDX license fix From 568ad27a01c678f89652e44d92af9a750841abd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:37:38 +0000 Subject: [PATCH 101/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4b4b2ec..b2edb2e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.34-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0.34-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2d62398826887713f0d88dd414c665dda5684ec5 Mon Sep 17 00:00:00 2001 From: Songsong Zhang Date: Fri, 23 Feb 2024 02:43:43 +0000 Subject: [PATCH 102/111] Add riscv64 support --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index b2edb2e..e9e2f96 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -19,7 +19,7 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch -ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 +ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc BuildRequires: make @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Fri Feb 23 2024 Songsong Zhang - 2.0.34-8 +- Add riscv64 support + * Mon Jan 22 2024 Fedora Release Engineering - 2.0.34-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 09111b9ad4dc00e4b94617900348f2643a79e44e Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 103/111] Eliminate use of obsolete %patchN syntax (#2283636) --- acpid.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index e9e2f96..1fb3364 100644 --- a/acpid.spec +++ b/acpid.spec @@ -33,7 +33,7 @@ acpid is a daemon that dispatches ACPI events to user-space programs. %prep %setup -q -%patch0 -p1 -b .kacpimon-dynamic-connections +%patch -P0 -p1 -b .kacpimon-dynamic-connections %build %configure From c41219a4ee38d442802a2f3e455f695ff3f4b790 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:33:54 +0000 Subject: [PATCH 104/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 1fb3364..7216002 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.34-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Feb 23 2024 Songsong Zhang - 2.0.34-8 - Add riscv64 support From 6a191fb96da045c629224fc870b5821c2bf956c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Aug 2024 16:34:53 +0200 Subject: [PATCH 105/111] Dropped videoconf, obsolete for some time Resolves: rhbz#2296943 --- acpid.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/acpid.spec b/acpid.spec index 7216002..956daa5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,10 +8,9 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz -Source2: acpid.video.conf Source3: acpid.power.conf Source4: acpid.power.sh Source5: acpid.service @@ -50,7 +49,6 @@ mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/sysconfig chmod 755 %{buildroot}%{_sysconfdir}/acpi/events -install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/acpi/events/videoconf install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/acpi/events/powerconf install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh install -p -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} @@ -63,7 +61,6 @@ install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid %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 @@ -100,6 +97,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Aug 12 2024 Jaroslav Škarvada - 2.0.34-10 +- Dropped videoconf, obsolete for some time + Resolves: rhbz#2296943 + * Wed Jul 17 2024 Fedora Release Engineering - 2.0.34-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 35d568ec65a6350a59b5665fdc39ef30423772b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:32:27 +0000 Subject: [PATCH 106/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 956daa5..74215ba 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -97,6 +97,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.0.34-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Aug 12 2024 Jaroslav Škarvada - 2.0.34-10 - Dropped videoconf, obsolete for some time Resolves: rhbz#2296943 From 3dff637eb55226cf9b98b4958baaf3f746964a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 14 Apr 2025 19:38:43 +0200 Subject: [PATCH 107/111] Dropped exclusivearch, the package is still useless on POWER (no firmware support yet), but it is required by some dependency Resolves: rhbz#2355763 --- acpid.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 74215ba..c519b12 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -18,7 +18,6 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch -ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc BuildRequires: make @@ -97,6 +96,11 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Apr 3 2025 Jaroslav Škarvada - 2.0.34-12 +- Dropped exclusivearch, the package is still useless on POWER (no firmware support + yet), but it is required by some dependency + Resolves: rhbz#2355763 + * Thu Jan 16 2025 Fedora Release Engineering - 2.0.34-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 682db2b5793dff66035db77263253caf36bed299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 15 Apr 2025 15:39:41 +0200 Subject: [PATCH 108/111] Used exclusiverch on RHEL --- acpid.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index c519b12..ce7f726 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -18,6 +18,9 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch +%if 0%{?rhel} +ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 +%endif URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc BuildRequires: make @@ -96,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Apr 15 2025 Jaroslav Škarvada - 2.0.34-13 +- Used exclusiverch on RHEL + * Thu Apr 3 2025 Jaroslav Škarvada - 2.0.34-12 - Dropped exclusivearch, the package is still useless on POWER (no firmware support yet), but it is required by some dependency From 5ad567f3c5129d565c8314d519ef2ca5ac395037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 15 Apr 2025 17:28:49 +0200 Subject: [PATCH 109/111] Updated RHEL/ELN exclusive arch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- acpid.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index ce7f726..f47d581 100644 --- a/acpid.spec +++ b/acpid.spec @@ -19,7 +19,7 @@ Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch %if 0%{?rhel} -ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 +ExclusiveArch: x86_64 aarch64 riscv64 %endif URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc From e712fb55ba7452146bf44a45dc5d46adb6b8f3fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:44:07 +0000 Subject: [PATCH 110/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index f47d581..30545be 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.0.34-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Apr 15 2025 Jaroslav Škarvada - 2.0.34-13 - Used exclusiverch on RHEL From 133283cf38f93f2f6eb931247d18f0fc19ee4877 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:25:32 +0000 Subject: [PATCH 111/111] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 30545be..6873b63 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.0.34-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.0.34-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild