commit: 95f5ebe0dd4eea0d1d90dea0b5afab1e22529ba6
parent 41a84914e3c779c56c5bfed272c8f4ae42e8fa02
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 2 Jul 2023 18:14:59 -0700
acpid: Update to 2.0.34
Diffstat:
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/pkg/acpid/patch/0001-Avoid-void-pointer-arithmetic.patch b/pkg/acpid/patch/0001-Avoid-void-pointer-arithmetic.patch
@@ -1,4 +1,4 @@
-From a6a138ee8c131b4ce056a5db516496c91610cf2f Mon Sep 17 00:00:00 2001
+From 2ce67cdaf8af1ab4198ef28da002d5275d314c34 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 16 Aug 2020 18:00:54 -0700
Subject: [PATCH] Avoid void pointer arithmetic
@@ -24,10 +24,10 @@ index ba218d7..08271cb 100644
/* places pointers into the message into tb[]. */
parse_rtattr(tb, CTRL_ATTR_MAX, attrs, len);
diff --git a/libnetlink.c b/libnetlink.c
-index 346162a..b1760ba 100644
+index 23ae7dd..24948bf 100644
--- a/libnetlink.c
+++ b/libnetlink.c
-@@ -516,7 +516,7 @@ int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
+@@ -523,7 +523,7 @@ int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
}
memcpy(NLMSG_TAIL(n), data, len);
@@ -50,5 +50,5 @@ index 8f9cb5e..7b2f8bc 100644
#ifndef IFA_RTA
#define IFA_RTA(r) \
--
-2.28.0
+2.37.3
diff --git a/pkg/acpid/patch/0004-Fix-fread-error-checking.patch b/pkg/acpid/patch/0004-Fix-fread-error-checking.patch
@@ -1,4 +1,4 @@
-From 2dfa73cf8b3be174696423996c17e4b30b4f1487 Mon Sep 17 00:00:00 2001
+From c3c72b271de395d0e4421e736700d60f96614725 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 1 May 2021 00:23:39 -0700
Subject: [PATCH] Fix fread error checking
@@ -13,10 +13,10 @@ and the ferror flag is set.
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/libnetlink.c b/libnetlink.c
-index b1760ba..5546ccb 100644
+index 24948bf..d94bd5f 100644
--- a/libnetlink.c
+++ b/libnetlink.c
-@@ -425,7 +425,7 @@ int rtnl_listen(struct rtnl_handle *rtnl,
+@@ -432,7 +432,7 @@ int rtnl_listen(struct rtnl_handle *rtnl,
int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
void *jarg)
{
@@ -25,7 +25,7 @@ index b1760ba..5546ccb 100644
struct sockaddr_nl nladdr;
char buf[8192];
struct nlmsghdr *h = (void*)buf;
-@@ -435,18 +435,19 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
+@@ -442,18 +442,19 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
nladdr.nl_pid = 0;
nladdr.nl_groups = 0;
@@ -51,7 +51,7 @@ index b1760ba..5546ccb 100644
len = h->nlmsg_len;
l = len - sizeof(*h);
-@@ -459,12 +460,11 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
+@@ -466,12 +467,11 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
status = fread(NLMSG_DATA(h), 1, NLMSG_ALIGN(l), rtnl);
@@ -69,7 +69,7 @@ index b1760ba..5546ccb 100644
return -1;
}
-@@ -472,6 +472,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
+@@ -479,6 +479,7 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
if (err < 0)
return err;
}
@@ -78,5 +78,5 @@ index b1760ba..5546ccb 100644
int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data)
--
-2.31.1
+2.37.3
diff --git a/pkg/acpid/patch/0005-Avoid-use-of-statement-expressions.patch b/pkg/acpid/patch/0005-Avoid-use-of-statement-expressions.patch
@@ -1,4 +1,4 @@
-From 7c59db620d4787759dd201e2ac20998c1d116ab9 Mon Sep 17 00:00:00 2001
+From 979d85c842898463192c7e7dae87798c1df6d471 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 30 Apr 2021 20:02:41 -0700
Subject: [PATCH] Avoid use of statement-expressions
@@ -102,7 +102,7 @@ index 6c67062..033466e 100644
/* a legit error */
return r;
diff --git a/input_layer.c b/input_layer.c
-index 5f050db..6e6cc26 100644
+index 00246b3..f6bddef 100644
--- a/input_layer.c
+++ b/input_layer.c
@@ -42,7 +42,6 @@
@@ -113,7 +113,7 @@ index 5f050db..6e6cc26 100644
#include "input_layer.h"
-@@ -298,7 +297,8 @@ static void process_input(int fd)
+@@ -352,7 +351,8 @@ static void process_input(int fd)
struct connection *c;
char str2[100];
@@ -170,10 +170,10 @@ index 39f2336..0000000
-
-#endif /* LIBC_COMPAT_H__ */
diff --git a/libnetlink.c b/libnetlink.c
-index 5546ccb..1478e28 100644
+index d94bd5f..7ad00df 100644
--- a/libnetlink.c
+++ b/libnetlink.c
-@@ -24,8 +24,6 @@
+@@ -31,8 +31,6 @@
#include <time.h>
#include <sys/uio.h>
@@ -182,7 +182,7 @@ index 5546ccb..1478e28 100644
#include "libnetlink.h"
void rtnl_close(struct rtnl_handle *rth)
-@@ -173,10 +171,11 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
+@@ -180,10 +178,11 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
struct nlmsghdr *h;
iov.iov_len = sizeof(buf);
@@ -196,7 +196,7 @@ index 5546ccb..1478e28 100644
continue;
}
-@@ -274,10 +273,11 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
+@@ -281,10 +280,11 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
while (1) {
iov.iov_len = sizeof(buf);
@@ -210,7 +210,7 @@ index 5546ccb..1478e28 100644
continue;
}
if (status == 0) {
-@@ -376,10 +376,11 @@ int rtnl_listen(struct rtnl_handle *rtnl,
+@@ -383,10 +383,11 @@ int rtnl_listen(struct rtnl_handle *rtnl,
iov.iov_base = buf;
while (1) {
iov.iov_len = sizeof(buf);
@@ -225,10 +225,10 @@ index 5546ccb..1478e28 100644
}
if (status == 0) {
diff --git a/netlink.c b/netlink.c
-index 27e3536..d89d280 100644
+index 8254762..695bb33 100644
--- a/netlink.c
+++ b/netlink.c
-@@ -41,7 +41,6 @@
+@@ -48,7 +48,6 @@
#include "libnetlink.h"
#include "genetlink.h"
#include "acpi_genetlink.h"
@@ -236,7 +236,7 @@ index 27e3536..d89d280 100644
#include "acpi_ids.h"
#include "connection_list.h"
-@@ -144,7 +143,8 @@ process_netlink(int fd)
+@@ -151,7 +150,8 @@ process_netlink(int fd)
iov.iov_len = sizeof(buf);
/* read the data into the buffer */
@@ -295,5 +295,5 @@ index 83b2aa9..15a3b4a 100644
}
if (cred) {
--
-2.31.1
+2.37.3
