* [PR PATCH] dhcpcd: update to 10.0.1
@ 2023-05-10 14:22 dkwo
2023-05-10 14:23 ` dkwo
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: dkwo @ 2023-05-10 14:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages dhcpcd
https://github.com/void-linux/void-packages/pull/43833
dhcpcd: update to 10.0.1
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/43833.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dhcpcd-43833.patch --]
[-- Type: text/x-diff, Size: 6788 bytes --]
From c50b4c3114ae31dd62d972af9606e1c79f42c06c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 10 May 2023 10:18:20 -0400
Subject: [PATCH] dhcpcd: update to 10.0.1
---
srcpkgs/dhcpcd/patches/privsep-ppc64le.patch | 23 ---
srcpkgs/dhcpcd/patches/revert-eloop.patch | 150 -------------------
srcpkgs/dhcpcd/template | 8 +-
3 files changed, 4 insertions(+), 177 deletions(-)
delete mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
delete mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch
diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
deleted file mode 100644
index 38a4264a59cd..000000000000
--- a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 156383a2ff84c01b347579ec8651a0a21384adf4
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Apr 3 20:18:51 2022 +0200
-
- use correct SECCOMP_AUDIT_ARCH
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index 9534fb0..b866bce 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- #elif defined(__or1k__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
- #elif defined(__powerpc64__)
--# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+# ifdef __LITTLE_ENDIAN__
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
-+# else
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+# endif
- #elif defined(__powerpc__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
- #elif defined(__riscv)
diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
deleted file mode 100644
index e41beb84b62b..000000000000
--- a/srcpkgs/dhcpcd/patches/revert-eloop.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 12 Nov 2021 16:24:32 +0000
-Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
- poll(2)"
-
-This stops dumping leases when privsep is compiled out.
-This change works fine on master, but we also have eloop using
-more of a native poll(2) style interface.
-Easier for now to just revert this on the dhcpcd-9 branch.
-
-This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
----
- src/eloop.c | 56 ++++++++++++++++-------------------------------------
- 1 file changed, 17 insertions(+), 39 deletions(-)
-
-diff --git a/src/eloop.c b/src/eloop.c
-index a6ab43fb..c3330817 100644
---- a/src/eloop.c
-+++ b/src/eloop.c
-@@ -32,7 +32,6 @@
- #include <errno.h>
- #include <limits.h>
- #include <poll.h>
--#include <stdbool.h>
- #include <signal.h>
- #include <stdint.h>
- #include <stdlib.h>
-@@ -137,7 +136,6 @@ struct eloop {
- TAILQ_HEAD (event_head, eloop_event) events;
- size_t nevents;
- struct event_head free_events;
-- bool events_need_setup;
-
- struct timespec now;
- TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
-@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
- static void
- eloop_event_setup_fds(struct eloop *eloop)
- {
-- struct eloop_event *e, *ne;
-+ struct eloop_event *e;
- struct pollfd *pfd;
-
- pfd = eloop->fds;
-- TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
-- if (e->fd == -1) {
-- TAILQ_REMOVE(&eloop->events, e, next);
-- TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
-- continue;
-- }
-+ TAILQ_FOREACH(e, &eloop->events, next) {
- #ifdef ELOOP_DEBUG
- fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
- __func__, getpid(), e->fd, e->read_cb, e->write_cb);
-@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
- pfd->revents = 0;
- pfd++;
- }
-- eloop->events_need_setup = false;
- }
-
- size_t
-@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
- }
-
- setup:
-- e->pollfd = NULL;
-- eloop->events_need_setup = true;
-+ eloop_event_setup_fds(eloop);
- return 0;
- }
-
-@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- struct eloop_event *e;
-
- assert(eloop != NULL);
-- if (fd == -1) {
-- errno = EINVAL;
-- return -1;
-- }
-
- TAILQ_FOREACH(e, &eloop->events, next) {
- if (e->fd == fd)
-@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- goto remove;
- e->write_cb = NULL;
- e->write_cb_arg = NULL;
-- if (e->pollfd != NULL) {
-- e->pollfd->events &= ~POLLOUT;
-- e->pollfd->revents &= ~POLLOUT;
-- }
-- return 1;
-+ goto done;
- }
-
- remove:
-- e->fd = -1;
-+ TAILQ_REMOVE(&eloop->events, e, next);
-+ TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
- eloop->nevents--;
-- eloop->events_need_setup = true;
-+
-+done:
-+ eloop_event_setup_fds(eloop);
- return 1;
- }
-
-@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- } else
- tsp = NULL;
-
-- if (eloop->events_need_setup)
-- eloop_event_setup_fds(eloop);
--
- n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
- if (n == -1) {
- if (errno == EINTR)
-@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- continue;
-
- TAILQ_FOREACH(e, &eloop->events, next) {
-- /* Skip freshly added events */
-- if (e->pollfd == NULL)
-- continue;
-- if (e->pollfd->revents)
-- n--;
-- if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
-- if (e->write_cb != NULL)
-+ if (e->pollfd->revents & POLLOUT) {
-+ if (e->write_cb != NULL) {
- e->write_cb(e->write_cb_arg);
-+ break;
-+ }
- }
-- if (e->fd != -1 &&
-- e->pollfd != NULL && e->pollfd->revents)
-- {
-- if (e->read_cb != NULL)
-+ if (e->pollfd->revents) {
-+ if (e->read_cb != NULL) {
- e->read_cb(e->read_cb_arg);
-+ break;
-+ }
- }
-- if (n == 0)
-- break;
- }
- }
-
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 93b3a8d66d9e..b30bb7c24af4 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
# Template file for 'dhcpcd'
pkgname=dhcpcd
-version=9.4.1
-revision=2
+version=10.0.1
+revision=1
build_style=configure
make_check_target=test
configure_args="
@@ -13,8 +13,8 @@ short_desc="RFC2131 compliant DHCP client"
maintainer="Cameron Nemo <cam@nohom.org>"
license="BSD-2-Clause"
homepage="https://roy.marples.name/projects/dhcpcd"
-distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
+distfiles="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v${version}.tar.gz"
+checksum=2bd3480bc93e6bff530872b8bc80cbcaa821449f7bf6aaf202fa12fb8c2e6f55
lib32disabled=yes
conf_files=/etc/dhcpcd.conf
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dhcpcd: update to 10.0.1
2023-05-10 14:22 [PR PATCH] dhcpcd: update to 10.0.1 dkwo
@ 2023-05-10 14:23 ` dkwo
2023-05-10 18:21 ` [PR PATCH] [Updated] " dkwo
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: dkwo @ 2023-05-10 14:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/43833#issuecomment-1542304021
Comment:
cc mantainer @CameronNemo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] dhcpcd: update to 10.0.1
2023-05-10 14:22 [PR PATCH] dhcpcd: update to 10.0.1 dkwo
2023-05-10 14:23 ` dkwo
@ 2023-05-10 18:21 ` dkwo
2023-05-11 14:58 ` dkwo
2023-06-14 17:34 ` [PR PATCH] [Merged]: " Duncaen
3 siblings, 0 replies; 5+ messages in thread
From: dkwo @ 2023-05-10 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages dhcpcd
https://github.com/void-linux/void-packages/pull/43833
dhcpcd: update to 10.0.1
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/43833.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dhcpcd-43833.patch --]
[-- Type: text/x-diff, Size: 6788 bytes --]
From 9a9fdd66715055df27918a938fc7703e360ee293 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 10 May 2023 10:18:20 -0400
Subject: [PATCH] dhcpcd: update to 10.0.1
---
srcpkgs/dhcpcd/patches/privsep-ppc64le.patch | 23 ---
srcpkgs/dhcpcd/patches/revert-eloop.patch | 150 -------------------
srcpkgs/dhcpcd/template | 8 +-
3 files changed, 4 insertions(+), 177 deletions(-)
delete mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
delete mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch
diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
deleted file mode 100644
index 38a4264a59cd..000000000000
--- a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 156383a2ff84c01b347579ec8651a0a21384adf4
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Apr 3 20:18:51 2022 +0200
-
- use correct SECCOMP_AUDIT_ARCH
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index 9534fb0..b866bce 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- #elif defined(__or1k__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
- #elif defined(__powerpc64__)
--# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+# ifdef __LITTLE_ENDIAN__
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
-+# else
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+# endif
- #elif defined(__powerpc__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
- #elif defined(__riscv)
diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
deleted file mode 100644
index e41beb84b62b..000000000000
--- a/srcpkgs/dhcpcd/patches/revert-eloop.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 12 Nov 2021 16:24:32 +0000
-Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
- poll(2)"
-
-This stops dumping leases when privsep is compiled out.
-This change works fine on master, but we also have eloop using
-more of a native poll(2) style interface.
-Easier for now to just revert this on the dhcpcd-9 branch.
-
-This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
----
- src/eloop.c | 56 ++++++++++++++++-------------------------------------
- 1 file changed, 17 insertions(+), 39 deletions(-)
-
-diff --git a/src/eloop.c b/src/eloop.c
-index a6ab43fb..c3330817 100644
---- a/src/eloop.c
-+++ b/src/eloop.c
-@@ -32,7 +32,6 @@
- #include <errno.h>
- #include <limits.h>
- #include <poll.h>
--#include <stdbool.h>
- #include <signal.h>
- #include <stdint.h>
- #include <stdlib.h>
-@@ -137,7 +136,6 @@ struct eloop {
- TAILQ_HEAD (event_head, eloop_event) events;
- size_t nevents;
- struct event_head free_events;
-- bool events_need_setup;
-
- struct timespec now;
- TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
-@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
- static void
- eloop_event_setup_fds(struct eloop *eloop)
- {
-- struct eloop_event *e, *ne;
-+ struct eloop_event *e;
- struct pollfd *pfd;
-
- pfd = eloop->fds;
-- TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
-- if (e->fd == -1) {
-- TAILQ_REMOVE(&eloop->events, e, next);
-- TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
-- continue;
-- }
-+ TAILQ_FOREACH(e, &eloop->events, next) {
- #ifdef ELOOP_DEBUG
- fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
- __func__, getpid(), e->fd, e->read_cb, e->write_cb);
-@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
- pfd->revents = 0;
- pfd++;
- }
-- eloop->events_need_setup = false;
- }
-
- size_t
-@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
- }
-
- setup:
-- e->pollfd = NULL;
-- eloop->events_need_setup = true;
-+ eloop_event_setup_fds(eloop);
- return 0;
- }
-
-@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- struct eloop_event *e;
-
- assert(eloop != NULL);
-- if (fd == -1) {
-- errno = EINVAL;
-- return -1;
-- }
-
- TAILQ_FOREACH(e, &eloop->events, next) {
- if (e->fd == fd)
-@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- goto remove;
- e->write_cb = NULL;
- e->write_cb_arg = NULL;
-- if (e->pollfd != NULL) {
-- e->pollfd->events &= ~POLLOUT;
-- e->pollfd->revents &= ~POLLOUT;
-- }
-- return 1;
-+ goto done;
- }
-
- remove:
-- e->fd = -1;
-+ TAILQ_REMOVE(&eloop->events, e, next);
-+ TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
- eloop->nevents--;
-- eloop->events_need_setup = true;
-+
-+done:
-+ eloop_event_setup_fds(eloop);
- return 1;
- }
-
-@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- } else
- tsp = NULL;
-
-- if (eloop->events_need_setup)
-- eloop_event_setup_fds(eloop);
--
- n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
- if (n == -1) {
- if (errno == EINTR)
-@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- continue;
-
- TAILQ_FOREACH(e, &eloop->events, next) {
-- /* Skip freshly added events */
-- if (e->pollfd == NULL)
-- continue;
-- if (e->pollfd->revents)
-- n--;
-- if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
-- if (e->write_cb != NULL)
-+ if (e->pollfd->revents & POLLOUT) {
-+ if (e->write_cb != NULL) {
- e->write_cb(e->write_cb_arg);
-+ break;
-+ }
- }
-- if (e->fd != -1 &&
-- e->pollfd != NULL && e->pollfd->revents)
-- {
-- if (e->read_cb != NULL)
-+ if (e->pollfd->revents) {
-+ if (e->read_cb != NULL) {
- e->read_cb(e->read_cb_arg);
-+ break;
-+ }
- }
-- if (n == 0)
-- break;
- }
- }
-
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 93b3a8d66d9e..b30bb7c24af4 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
# Template file for 'dhcpcd'
pkgname=dhcpcd
-version=9.4.1
-revision=2
+version=10.0.1
+revision=1
build_style=configure
make_check_target=test
configure_args="
@@ -13,8 +13,8 @@ short_desc="RFC2131 compliant DHCP client"
maintainer="Cameron Nemo <cam@nohom.org>"
license="BSD-2-Clause"
homepage="https://roy.marples.name/projects/dhcpcd"
-distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
+distfiles="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v${version}.tar.gz"
+checksum=2bd3480bc93e6bff530872b8bc80cbcaa821449f7bf6aaf202fa12fb8c2e6f55
lib32disabled=yes
conf_files=/etc/dhcpcd.conf
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] dhcpcd: update to 10.0.1
2023-05-10 14:22 [PR PATCH] dhcpcd: update to 10.0.1 dkwo
2023-05-10 14:23 ` dkwo
2023-05-10 18:21 ` [PR PATCH] [Updated] " dkwo
@ 2023-05-11 14:58 ` dkwo
2023-06-14 17:34 ` [PR PATCH] [Merged]: " Duncaen
3 siblings, 0 replies; 5+ messages in thread
From: dkwo @ 2023-05-11 14:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages dhcpcd
https://github.com/void-linux/void-packages/pull/43833
dhcpcd: update to 10.0.1
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/43833.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dhcpcd-43833.patch --]
[-- Type: text/x-diff, Size: 6788 bytes --]
From 73a35744277b0bfbbb076e0910f256ba1f62777e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 10 May 2023 10:18:20 -0400
Subject: [PATCH] dhcpcd: update to 10.0.1
---
srcpkgs/dhcpcd/patches/privsep-ppc64le.patch | 23 ---
srcpkgs/dhcpcd/patches/revert-eloop.patch | 150 -------------------
srcpkgs/dhcpcd/template | 8 +-
3 files changed, 4 insertions(+), 177 deletions(-)
delete mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
delete mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch
diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
deleted file mode 100644
index 38a4264a59cd..000000000000
--- a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 156383a2ff84c01b347579ec8651a0a21384adf4
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Apr 3 20:18:51 2022 +0200
-
- use correct SECCOMP_AUDIT_ARCH
-
-diff --git a/src/privsep-linux.c b/src/privsep-linux.c
-index 9534fb0..b866bce 100644
---- a/src/privsep-linux.c
-+++ b/src/privsep-linux.c
-@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
- #elif defined(__or1k__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
- #elif defined(__powerpc64__)
--# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+# ifdef __LITTLE_ENDIAN__
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
-+# else
-+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
-+# endif
- #elif defined(__powerpc__)
- # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
- #elif defined(__riscv)
diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
deleted file mode 100644
index e41beb84b62b..000000000000
--- a/srcpkgs/dhcpcd/patches/revert-eloop.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Fri, 12 Nov 2021 16:24:32 +0000
-Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
- poll(2)"
-
-This stops dumping leases when privsep is compiled out.
-This change works fine on master, but we also have eloop using
-more of a native poll(2) style interface.
-Easier for now to just revert this on the dhcpcd-9 branch.
-
-This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
----
- src/eloop.c | 56 ++++++++++++++++-------------------------------------
- 1 file changed, 17 insertions(+), 39 deletions(-)
-
-diff --git a/src/eloop.c b/src/eloop.c
-index a6ab43fb..c3330817 100644
---- a/src/eloop.c
-+++ b/src/eloop.c
-@@ -32,7 +32,6 @@
- #include <errno.h>
- #include <limits.h>
- #include <poll.h>
--#include <stdbool.h>
- #include <signal.h>
- #include <stdint.h>
- #include <stdlib.h>
-@@ -137,7 +136,6 @@ struct eloop {
- TAILQ_HEAD (event_head, eloop_event) events;
- size_t nevents;
- struct event_head free_events;
-- bool events_need_setup;
-
- struct timespec now;
- TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
-@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
- static void
- eloop_event_setup_fds(struct eloop *eloop)
- {
-- struct eloop_event *e, *ne;
-+ struct eloop_event *e;
- struct pollfd *pfd;
-
- pfd = eloop->fds;
-- TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
-- if (e->fd == -1) {
-- TAILQ_REMOVE(&eloop->events, e, next);
-- TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
-- continue;
-- }
-+ TAILQ_FOREACH(e, &eloop->events, next) {
- #ifdef ELOOP_DEBUG
- fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
- __func__, getpid(), e->fd, e->read_cb, e->write_cb);
-@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
- pfd->revents = 0;
- pfd++;
- }
-- eloop->events_need_setup = false;
- }
-
- size_t
-@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
- }
-
- setup:
-- e->pollfd = NULL;
-- eloop->events_need_setup = true;
-+ eloop_event_setup_fds(eloop);
- return 0;
- }
-
-@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- struct eloop_event *e;
-
- assert(eloop != NULL);
-- if (fd == -1) {
-- errno = EINVAL;
-- return -1;
-- }
-
- TAILQ_FOREACH(e, &eloop->events, next) {
- if (e->fd == fd)
-@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
- goto remove;
- e->write_cb = NULL;
- e->write_cb_arg = NULL;
-- if (e->pollfd != NULL) {
-- e->pollfd->events &= ~POLLOUT;
-- e->pollfd->revents &= ~POLLOUT;
-- }
-- return 1;
-+ goto done;
- }
-
- remove:
-- e->fd = -1;
-+ TAILQ_REMOVE(&eloop->events, e, next);
-+ TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
- eloop->nevents--;
-- eloop->events_need_setup = true;
-+
-+done:
-+ eloop_event_setup_fds(eloop);
- return 1;
- }
-
-@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- } else
- tsp = NULL;
-
-- if (eloop->events_need_setup)
-- eloop_event_setup_fds(eloop);
--
- n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
- if (n == -1) {
- if (errno == EINTR)
-@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
- continue;
-
- TAILQ_FOREACH(e, &eloop->events, next) {
-- /* Skip freshly added events */
-- if (e->pollfd == NULL)
-- continue;
-- if (e->pollfd->revents)
-- n--;
-- if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
-- if (e->write_cb != NULL)
-+ if (e->pollfd->revents & POLLOUT) {
-+ if (e->write_cb != NULL) {
- e->write_cb(e->write_cb_arg);
-+ break;
-+ }
- }
-- if (e->fd != -1 &&
-- e->pollfd != NULL && e->pollfd->revents)
-- {
-- if (e->read_cb != NULL)
-+ if (e->pollfd->revents) {
-+ if (e->read_cb != NULL) {
- e->read_cb(e->read_cb_arg);
-+ break;
-+ }
- }
-- if (n == 0)
-- break;
- }
- }
-
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 93b3a8d66d9e..b30bb7c24af4 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
# Template file for 'dhcpcd'
pkgname=dhcpcd
-version=9.4.1
-revision=2
+version=10.0.1
+revision=1
build_style=configure
make_check_target=test
configure_args="
@@ -13,8 +13,8 @@ short_desc="RFC2131 compliant DHCP client"
maintainer="Cameron Nemo <cam@nohom.org>"
license="BSD-2-Clause"
homepage="https://roy.marples.name/projects/dhcpcd"
-distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
+distfiles="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/v${version}.tar.gz"
+checksum=2bd3480bc93e6bff530872b8bc80cbcaa821449f7bf6aaf202fa12fb8c2e6f55
lib32disabled=yes
conf_files=/etc/dhcpcd.conf
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: dhcpcd: update to 10.0.1
2023-05-10 14:22 [PR PATCH] dhcpcd: update to 10.0.1 dkwo
` (2 preceding siblings ...)
2023-05-11 14:58 ` dkwo
@ 2023-06-14 17:34 ` Duncaen
3 siblings, 0 replies; 5+ messages in thread
From: Duncaen @ 2023-06-14 17:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
There's a merged pull request on the void-packages repository
dhcpcd: update to 10.0.1
https://github.com/void-linux/void-packages/pull/43833
Description:
- I tested the changes in this PR: yes
- I built this PR locally for my native architecture, x86_64-musl
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-14 17:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-10 14:22 [PR PATCH] dhcpcd: update to 10.0.1 dkwo
2023-05-10 14:23 ` dkwo
2023-05-10 18:21 ` [PR PATCH] [Updated] " dkwo
2023-05-11 14:58 ` dkwo
2023-06-14 17:34 ` [PR PATCH] [Merged]: " Duncaen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).