From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
	by lore.proxmox.com (Postfix) with ESMTPS id CAB4D1FF17A
	for <inbox@lore.proxmox.com>; Sat, 23 Nov 2024 07:21:14 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 123531D539;
	Sat, 23 Nov 2024 07:21:22 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Sat, 23 Nov 2024 15:19:36 +0900
MIME-Version: 1.0
Message-ID: <mailman.602.1732342880.391.pve-devel@lists.proxmox.com>
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Post: <mailto:pve-devel@lists.proxmox.com>
From: Jing Luo via pve-devel <pve-devel@lists.proxmox.com>
Precedence: list
Cc: Jing Luo <jing@jing.rocks>
X-Mailman-Version: 2.1.29
X-BeenThere: pve-devel@lists.proxmox.com
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
Subject: [pve-devel] [PATCH pve-network] SDN: Dhcp: perl 5.40 compat
Content-Type: multipart/mixed; boundary="===============8515126628366928654=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

--===============8515126628366928654==
Content-Type: message/rfc822
Content-Disposition: inline

Return-Path: <jing@jing.rocks>
X-Original-To: pve-devel@lists.proxmox.com
Delivered-To: pve-devel@lists.proxmox.com
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
	(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 lists.proxmox.com (Postfix) with ESMTPS id A9CAAC8ED7
	for <pve-devel@lists.proxmox.com>; Sat, 23 Nov 2024 07:21:20 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 7798F1D50B
	for <pve-devel@lists.proxmox.com>; Sat, 23 Nov 2024 07:20:50 +0100 (CET)
Received: from mail-gw3.jing.rocks (mail-gw3.jing.rocks [219.117.250.209])
	(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 firstgate.proxmox.com (Proxmox) with ESMTPS
	for <pve-devel@lists.proxmox.com>; Sat, 23 Nov 2024 07:20:49 +0100 (CET)
Received: from mail-gw3.jing.rocks (localhost [127.0.0.1])
	by mail-gw3.jing.rocks (Proxmox) with ESMTP id 8E2E4216D9
	for <pve-devel@lists.proxmox.com>; Sat, 23 Nov 2024 15:20:47 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jing.rocks; h=cc
	:cc:content-transfer-encoding:date:from:from:message-id
	:mime-version:reply-to:subject:subject:to:to; s=mail-gw; bh=HIDR
	mL7o1sFHWZSUDV0cSE72m12dP51c15o/7yyrnbQ=; b=APyz08+SVhi+EHezPDpp
	35LmhVrO1JpPTJRidMKyebPvNbtKcUAvpT70Y09qS22jgIzInAUnv+QXpOYRRf9d
	Qti9Aj24PImniUZ35gK3wP3C9QEjvdbXPTs5Wly1eDMVjphNrHwW/Hnnf0KOzi2o
	WESmR7Zkdv4eSEpXyIBVj8bzNR4vbbuIX+PbomiXNrlNp24UtYUarBX7xMFzQYOs
	KD6tN57BtWywkPF4nDd9hZWpY5Tqernj8yVZI+M1/14d1T063h8XpZlJ1y0TqYAW
	J3tFKyIi/jfxfvxw5yPdDTq1v+23hUdJ3GxkVoap6fj1hB5q/0ueP9BrZWlAHTCf
	TA==
Received: from mail.jing.rocks (mail.jing.rocks [192.168.0.222])
	(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 mail-gw3.jing.rocks (Proxmox) with ESMTPS id 674A9215F9
	for <pve-devel@lists.proxmox.com>; Sat, 23 Nov 2024 15:20:46 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jing.rocks;
	s=default; t=1732342846;
	bh=1fx9D64lCD5ThjOKMfn2GS42rbN2AMn8vuTqsyq0RyU=;
	h=From:To:Cc:Subject:Date:From;
	b=xGCPeqKFfOoIyq//iriFy1B95XId0MqMMMAB+aSUB4ylkkpximeYvrvdVD/cawyAy
	 l/gbFCdUae0T7RAeseJhuv8T3dMD4B1YqExvg7tQj8qTdDcKnpM6dMih95zJZObafa
	 OOydyZuozQz+x+0+wBVTABCNKLmUn4Ynz+AdHribqTkyDDmVhzAMAS7BSM1HQuLKPw
	 lUoPD8sfocI+inSbKmB+w1WCvyH5c8VmXm8zXuqYMjqZOvu191uHrOPmK+BQd4UzPk
	 S9fUGVzszilvb23frQPfBvZhi9alzU5JgLAujYaZZAfbhf/ubwrrAKMh4wx7K2rFZ7
	 OwF3iC7pAJNDg==
Received: from X570AM.jing.rocks (X570AM.jing.rocks [IPv6:240b:10:f00:1b00::7e82])
	(Authenticated sender: jing@jing.rocks)
	by mail.jing.rocks (Postfix) with ESMTPSA id 5A08F3D40C;
	Sat, 23 Nov 2024 15:20:46 +0900 (JST)
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH pve-network] SDN: Dhcp: perl 5.40 compat
Date: Sat, 23 Nov 2024 15:19:36 +0900
Message-ID: <20241123062041.1641221-1-jing@jing.rocks>
X-Mailer: git-send-email 2.47.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
	AWL                    -0.000 Adjusted score from AWL reputation of From: address
	BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
	DKIM_SIGNED               0.1 Message has a DKIM or DK signature, not necessarily valid
	DKIM_VALID               -0.1 Message has at least one valid DKIM or DK signature
	DKIM_VALID_AU            -0.1 Message has a valid DKIM or DK signature from author's domain
	DKIM_VALID_EF            -0.1 Message has a valid DKIM or DK signature from envelope-from domain
	DMARC_PASS               -0.1 DMARC pass policy
	KAM_INFOUSMEBIZ          0.75 Prevalent use of .info|.us|.me|.me.uk|.biz|xyz|id|rocks|life domains in spam/malware
	KAM_OTHER_BAD_TLD        0.75 Other untrustworthy TLDs
	RCVD_IN_VALIDITY_CERTIFIED_BLOCKED  0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
	RCVD_IN_VALIDITY_RPBL_BLOCKED  0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
	RCVD_IN_VALIDITY_SAFE_BLOCKED  0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
	SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
	SPF_PASS               -0.001 SPF: sender matches SPF record
	URIBL_BLOCKED           0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked.  See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jing.rocks,dhcp.pm]

On trixie with perl 5.40 we see these errors:

Nov 14 06:28:54 pi16 pve-firewall[932]: Attempt to call undefined import method with arguments ("config") via package "PVE::Network::SDN::Dhcp" (Perhaps you forgot to load the package?) at /usr/share/perl5/PVE/Network/SDN/Dhcp.pm line 10, <DATA> line 960.
Nov 14 06:28:54 pi16 pve-firewall[932]: Attempt to call undefined import method with arguments ("sdn_subnets_config" ...) via package "PVE::Network::SDN::Subnets" (Perhaps you forgot to load the package?) at /usr/share/perl5/PVE/Network/SDN/Dhcp.pm line 12, <DATA> line 960.
Nov 14 06:28:54 pi16 pvestatd[904]: Attempt to call undefined import method with arguments ("config") via package "PVE::Network::SDN::Dhcp" (Perhaps you forgot to load the package?) at /usr/share/perl5/PVE/Network/SDN/Dhcp.pm line 10, <DATA> line 960.
Nov 14 06:28:54 pi16 pvestatd[904]: Attempt to call undefined import method with arguments ("sdn_subnets_config" ...) via package "PVE::Network::SDN::Subnets" (Perhaps you forgot to load the package?) at /usr/share/perl5/PVE/Network/SDN/Dhcp.pm line 12, <DATA> line 960.
Nov 14 06:28:54 pi16 pvedaemon[1126]: Attempt to call undefined import method with arguments ("config") via package "PVE::Network::SDN::Dhcp" (Perhaps you forgot to load the package?) at /usr/share/perl5/PVE/Network/SDN/Dhcp.pm line 10, <DATA> line 960.
Nov 14 06:28:54 pi16 pvedaemon[1126]: Attempt to call undefined import method with arguments ("sdn_subnets_config" ...) via package "PVE::Network::SDN::Subnets" (Perhaps you forgot to load the package?) at /usr/share/perl5/PVE/Network/SDN/Dhcp.pm line 12, <DATA> line 960.

So let's fix it. No regression for bookworm so far.

Signed-off-by: Jing Luo <jing@jing.rocks>
---
probably should've opened a ticket on bugzilla? anyways...
---
 src/PVE/Network/SDN/Dhcp.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm
index d48de34..c42e730 100644
--- a/src/PVE/Network/SDN/Dhcp.pm
+++ b/src/PVE/Network/SDN/Dhcp.pm
@@ -7,9 +7,9 @@ use PVE::Cluster qw(cfs_read_file);
 
 use PVE::Network::SDN;
 use PVE::Network::SDN::SubnetPlugin;
-use PVE::Network::SDN::Dhcp qw(config);
+use PVE::Network::SDN::Dhcp;
 use PVE::Network::SDN::Ipams;
-use PVE::Network::SDN::Subnets qw(sdn_subnets_config config get_dhcp_ranges);
+use PVE::Network::SDN::Subnets;
 use PVE::Network::SDN::Dhcp::Plugin;
 use PVE::Network::SDN::Dhcp::Dnsmasq;
 
-- 
2.47.0




--===============8515126628366928654==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

--===============8515126628366928654==--