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