From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23B37158020 for ; Fri, 14 Oct 2022 18:26:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B710E0864; Fri, 14 Oct 2022 18:26:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7742E0864 for ; Fri, 14 Oct 2022 18:26:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5AAC340A9C for ; Fri, 14 Oct 2022 18:26:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 130F6615 for ; Fri, 14 Oct 2022 18:26:08 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1665771926.5516475e7648dc3c46a680475f1f3c9124ce88a7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/files/, net-misc/dhcp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dhcp/dhcp-4.4.3_p1.ebuild net-misc/dhcp/files/dhcp-3.0-fix-perms.patch net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch X-VCS-Directories: net-misc/dhcp/ net-misc/dhcp/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 5516475e7648dc3c46a680475f1f3c9124ce88a7 X-VCS-Branch: master Date: Fri, 14 Oct 2022 18:26:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f35ab29-4a86-4a1a-a300-5982c11295f3 X-Archives-Hash: d51d9924841bd1e5a8f273afd1aff6f2 commit: 5516475e7648dc3c46a680475f1f3c9124ce88a7 Author: David Seifert gentoo org> AuthorDate: Fri Oct 14 18:25:26 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Oct 14 18:25:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5516475e net-misc/dhcp: rebase patches Signed-off-by: David Seifert gentoo.org> net-misc/dhcp/dhcp-4.4.3_p1.ebuild | 20 +++++----- ...pt-4.patch => dhcp-4.4.3-always-accept-4.patch} | 0 ...6.patch => dhcp-4.4.3-bindtodevice-inet6.patch} | 11 +++--- ...ent-ntp.patch => dhcp-4.4.3-dhclient-ntp.patch} | 0 ....patch => dhcp-4.4.3-dhclient-resolvconf.patch} | 44 +++++++++++----------- ....patch => dhcp-4.4.3-dhclient-stdin-conf.patch} | 0 ...-fix-perms.patch => dhcp-4.4.3-fix-perms.patch} | 6 +-- ...2-path.patch => dhcp-4.4.3-iproute2-path.patch} | 0 ....patch => dhcp-4.4.3-ldap-ipv6-client-id.patch} | 0 ...-nogateway.patch => dhcp-4.4.3-nogateway.patch} | 0 ...er-ping.patch => dhcp-4.4.3-quieter-ping.patch} | 0 11 files changed, 40 insertions(+), 41 deletions(-) diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild index 9db36ddb42da..e425d52ea36c 100644 --- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild @@ -50,26 +50,26 @@ src_unpack() { PATCHES=( # Gentoo patches - these will probably never be accepted upstream # Fix some permission issues - "${FILESDIR}/${PN}-3.0-fix-perms.patch" + "${FILESDIR}/${PN}-4.4.3-fix-perms.patch" # Enable dhclient to equery NTP servers - "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch" - "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch" + "${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch" + "${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch" # Enable dhclient to get extra configuration from stdin - "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch" + "${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch" # bug #265531 - "${FILESDIR}/${PN}-4.3.6-nogateway.patch" + "${FILESDIR}/${PN}-4.4.3-nogateway.patch" # bug #296921 - "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" + "${FILESDIR}/${PN}-4.4.3-quieter-ping.patch" # bug #437108 - "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" + "${FILESDIR}/${PN}-4.4.3-always-accept-4.patch" # bug #480636 - "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" + "${FILESDIR}/${PN}-4.4.3-iproute2-path.patch" # bug #471142 - "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" + "${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch" # bug #559832 - "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" + "${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch" # Possible upstream candidates ) diff --git a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch similarity index 100% rename from net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch rename to net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch similarity index 51% rename from net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch rename to net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch index 77254c32e2b0..f6ea0f858c6d 100644 --- a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch @@ -5,15 +5,14 @@ snipped from fedora # dhclient -6: bind socket to interface (#1001742) # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784]) -diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c ---- dhcp-4.2.5/common/socket.c.bindtodevice_inet6 2013-09-17 16:47:05.000000000 +0200 -+++ dhcp-4.2.5/common/socket.c 2013-09-17 16:48:18.975997842 +0200 -@@ -245,7 +245,7 @@ if_register_socket(struct interface_info +--- a/common/socket.c ++++ b/common/socket.c +@@ -266,7 +266,7 @@ #if defined(SO_BINDTODEVICE) /* Bind this socket to this interface. */ - if ((local_family != AF_INET6) && (info->ifp != NULL) && + if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) && setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, - (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) { - log_fatal("setsockopt: SO_BINDTODEVICE: %m"); + (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) { + log_fatal("Can't set SO_BINDTODEVICE on dhcp socket for" diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch similarity index 100% rename from net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch rename to net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch similarity index 95% rename from net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch rename to net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch index ccfdbcf4a206..63a67b7b1151 100644 --- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch @@ -1,5 +1,5 @@ ---- dhcp-4.3.6/client/scripts/bsdos -+++ dhcp-4.3.6/client/scripts/bsdos +--- a/client/scripts/bsdos ++++ b/client/scripts/bsdos @@ -1,27 +1,25 @@ #!/bin/sh @@ -55,10 +55,10 @@ + chmod 644 /etc/resolv.conf + fi fi - } - ---- dhcp-4.3.6/client/scripts/freebsd -+++ dhcp-4.3.6/client/scripts/freebsd + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf +--- a/client/scripts/freebsd ++++ b/client/scripts/freebsd @@ -11,54 +11,23 @@ fi @@ -160,9 +160,9 @@ + chmod 644 /etc/resolv.conf fi fi - } ---- dhcp-4.3.6/client/scripts/linux -+++ dhcp-4.3.6/client/scripts/linux + # If we're making confs, may as well make an ntp.conf too +--- a/client/scripts/linux ++++ b/client/scripts/linux @@ -35,16 +35,16 @@ # update /etc/resolv.conf based on received values # This updated version mostly follows Debian script by Andrew Pollock et al. @@ -248,10 +248,10 @@ fi - mv -f $new_resolv_conf /etc/resolv.conf fi - } ---- dhcp-4.3.6/client/scripts/netbsd -+++ dhcp-4.3.6/client/scripts/netbsd + # If we're making confs, may as well make an ntp.conf too +--- a/client/scripts/netbsd ++++ b/client/scripts/netbsd @@ -1,27 +1,25 @@ #!/bin/sh @@ -308,10 +308,10 @@ + chmod 644 /etc/resolv.conf + fi fi - } - ---- dhcp-4.3.6/client/scripts/openbsd -+++ dhcp-4.3.6/client/scripts/openbsd + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf +--- a/client/scripts/openbsd ++++ b/client/scripts/openbsd @@ -1,27 +1,25 @@ #!/bin/sh @@ -369,10 +369,10 @@ + chmod 644 /etc/resolv.conf + fi fi - } - ---- dhcp-4.3.6/client/scripts/solaris -+++ dhcp-4.3.6/client/scripts/solaris + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf +--- a/client/scripts/solaris ++++ b/client/scripts/solaris @@ -1,21 +1,39 @@ #!/bin/sh @@ -418,5 +418,5 @@ + chmod 644 /etc/resolv.conf + fi fi - } - + # If we're making confs, may as well make an ntp.conf too + make_ntp_conf diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch similarity index 100% rename from net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch rename to net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch similarity index 79% rename from net-misc/dhcp/files/dhcp-3.0-fix-perms.patch rename to net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch index f4b3fd18e167..5b3a8ab2c20a 100644 --- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch +++ b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch @@ -1,6 +1,6 @@ --- a/server/dhcpd.c +++ b/server/dhcpd.c -@@ -602,6 +602,12 @@ +@@ -892,6 +892,12 @@ if (lftest) exit (0); @@ -11,5 +11,5 @@ +#endif /* PARANOIA */ + /* Discover all the network interfaces and initialize them. */ - discover_interfaces (DISCOVER_SERVER); - + #if defined(DHCPv6) && defined(DHCP4o6) + if (dhcpv4_over_dhcpv6) { diff --git a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch similarity index 100% rename from net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch rename to net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch similarity index 100% rename from net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch rename to net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch similarity index 100% rename from net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch rename to net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch diff --git a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch similarity index 100% rename from net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch rename to net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch