#2 Update to 10.04
Merged 7 months ago by pzacik. Opened 7 months ago by pzacik.
rpms/ pzacik/dhcpcd update-10.04  into  rawhide

Update to 10.04
Pavol Žáčik • 7 months ago  
file modified
+2
@@ -9,3 +9,5 @@ 

  /dhcpcd-10.0.1.tar.xz.asc

  /dhcpcd-10.0.2.tar.xz

  /dhcpcd-10.0.2.tar.xz.asc

+ /dhcpcd-10.0.4.tar.xz

+ /dhcpcd-10.0.4.tar.xz.asc

@@ -1,27 +0,0 @@ 

- From 5836269b2a1ba55ba9b0f2efdbc4fdca4853d452 Mon Sep 17 00:00:00 2001

- From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>

- Date: Sun, 23 Jul 2023 15:44:32 +0200

- Subject: [PATCH] Do not crash on dhcpcd test run

- 

- Check if state->bpf is allocated before attempting to write there.

- ---

-  src/dhcp.c | 3 ++-

-  1 file changed, 2 insertions(+), 1 deletion(-)

- 

- diff --git a/src/dhcp.c b/src/dhcp.c

- index edd1c01..e029cee 100644

- --- a/src/dhcp.c

- +++ b/src/dhcp.c

- @@ -3314,7 +3314,8 @@ dhcp_handledhcp(struct interface *ifp, struct bootp *bootp, size_t bootp_len,

-  			state->reason = "TEST";

-  			script_runreason(ifp, state->reason);

-  			eloop_exit(ifp->ctx->eloop, EXIT_SUCCESS);

- -			state->bpf->bpf_flags |= BPF_EOF;

- +			if (state->bpf)

- +				state->bpf->bpf_flags |= BPF_EOF;

-  			return;

-  		}

-  		eloop_timeout_delete(ifp->ctx->eloop, send_discover, ifp);

- -- 

- 2.41.0

- 

file modified
+1 -4
@@ -1,7 +1,7 @@ 

  %global forgeurl0 https://github.com/NetworkConfiguration/dhcpcd

  

  Name: dhcpcd

- Version: 10.0.2

+ Version: 10.0.4

  Release: %autorelease

  Summary: A minimalistic network configuration daemon with DHCPv4, rdisc and DHCPv6 support

  License: BSD-2-Clause AND ISC AND MIT
@@ -15,9 +15,6 @@ 

  Source4: %{name}@.service

  Source5: systemd-sysusers.conf

  

- # https://github.com/NetworkConfiguration/dhcpcd/pull/231

- Patch1:  dhcpcd-10.0.2-test.patch

- 

  BuildRequires: gcc

  BuildRequires: systemd-rpm-macros

  BuildRequires: chrony

file modified
+2 -2
@@ -1,2 +1,2 @@ 

- SHA512 (dhcpcd-10.0.2.tar.xz) = 1231caba6b6a2264ba80be0c888f52ce1c8de21289c3a4452b5319dae76d8c1c78331a822372e77ee1419d12c23c1d57df712499d43983eb535e79c6a8e78f42

- SHA512 (dhcpcd-10.0.2.tar.xz.asc) = f9bb3a073985fae6cd118ea1b7fa1fd24a0d809592f960d3284a1f76fb0c278a409c28cc8bc75eed7c782cf9c6772aa53cc0077f6d451a36bef8da226d17605c

+ SHA512 (dhcpcd-10.0.4.tar.xz) = 8af26c4a42ce63e9cae72de68774807b8739aabd19cc2a0260148f3baa25c587bf34a5a0b80239b54d8ab9b79661744e61b0e316d2c510c4da65615268d3e8cf

+ SHA512 (dhcpcd-10.0.4.tar.xz.asc) = b6a3c915ef0582c40e05e6a2d2499f648313d2ca310abb5390d98cf04b9f9d28f7f8b9fdfe64258acfce4f9ecc7ca023f87bdf45261ea0fdff313d99c1f767bf

rebased onto e0f6455

7 months ago

Pull-Request has been merged by pzacik

7 months ago