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 29E671FF168
for <inbox@lore.proxmox.com>; Tue, 12 Nov 2024 20:15:52 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 727D59117;
Tue, 12 Nov 2024 20:15:50 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Wed, 13 Nov 2024 04:06:16 +0900
MIME-Version: 1.0
Message-ID: <mailman.167.1731438949.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] patches: upstream: python3.12 compat
Content-Type: multipart/mixed; boundary="===============3737215794861617524=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
--===============3737215794861617524==
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id C4BB5C30DD
for <pve-devel@lists.proxmox.com>; Tue, 12 Nov 2024 20:15:48 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 9F9AC9066
for <pve-devel@lists.proxmox.com>; Tue, 12 Nov 2024 20:15:48 +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>; Tue, 12 Nov 2024 20:15:45 +0100 (CET)
Received: from mail-gw3.jing.rocks (localhost [127.0.0.1])
by mail-gw3.jing.rocks (Proxmox) with ESMTP id 6EDE71EE55
for <pve-devel@lists.proxmox.com>; Wed, 13 Nov 2024 04:08:23 +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=GJti
D1KBogK1hqUk1l+g4OhAF4XcQ2W2fnLcYTNmg7M=; b=lFL4Tld87gytFXV5kooA
8PA7tHqwZnWkWVKIrTo9c7NIAK0uraDgPU7mfo5xum6K2EfKOw/8uV5RdhC5rzxd
gSU+k5daM3Ck7gax2TmWPlgJ+pnbv4vt9iRF4T/1qPzmbQqVSSjbHFIIi8gP8DtL
36ydXx56qnGz2dc2ObHB0SyGKcwNy0w9/ZmTJrg/rQ+3NniGa514vKaRHcVQW+z6
2tVDbuCzObreT0L0W+H0a1Tva5PHQRXQl5NV7/wCVjokmZQ8Frya5Qz9hdUfLrBF
7gVUhVjrWZe5DdjeXjcRsnEYfiu6yLM/h/Xl1d9CMcz76itlhBoJCizjRc36q3L7
1Q==
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 B0DA11EE54
for <pve-devel@lists.proxmox.com>; Wed, 13 Nov 2024 04:08:20 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jing.rocks;
s=default; t=1731438500;
bh=LJjcLzojBEY+wwlrphS/0xqapC+G4ShvRWd5+B3uOQs=;
h=From:To:Cc:Subject:Date:From;
b=qxl3ExGVjl93EWTwcrnhrndcFrxXnvb8/L+tRce9e5h5kxD0TSB9lLGWDqnigunmw
UBt1OqEju8T2/JQYeTs0TO8wd5vISWZ4BWfk/RqRdZ1WmTBiw0BYOaNv2EIiTSSuGJ
6rPfDeG0hyOvC9y9EZsEKj++wUQdDR9UsKzcGo+QDEaBsW2EX4+q7bpNnIH1mJ8wSc
Ahzmrf86NdZm1QTu6NLkPKddH8yP9LGz/hPN0v/T88kPgDuRbujb0vCDS44zHcw7OE
X8oa7WoQVrxm7uplZYKlzHxKL3+oPr8+ldbdbG5C87uJRBsxugVIfOHT+QxWBUwUfJ
7jqW94eUBKZBg==
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 A1C4A2C3C5;
Wed, 13 Nov 2024 04:08:20 +0900 (JST)
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH] patches: upstream: python3.12 compat
Date: Wed, 13 Nov 2024 04:06:16 +0900
Message-ID: <20241112190615.3293806-2-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.002 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
Prepare for debian trixie. Upstream has not yet made a new release since
Dec 2023, backporting this commit to make ifupdown2 work on trixie. Also
fixes an RC bug on debian (#1074250). Also fixed a typo in the commit msg.
upstream: https://github.com/CumulusNetworks/ifupdown2/commit/fc0318378e878ffe639d1d1285936d1256dd67cf
Signed-off-by: Jing Luo <jing@jing.rocks>
---
debian/patches/series | 1 +
.../upstream/0001-python312-compat.patch | 27 +++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 debian/patches/upstream/0001-python312-compat.patch
diff --git a/debian/patches/series b/debian/patches/series
index 7ae3f0a..c14c181 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ upstream/0001-scheduler-import-traceback.patch
upstream/0001-addons-vxlan-fix-compare-between-remote-ips-and-old_.patch
upstream/0001-scheduler-avoid-waiting-for-stdout-eof-of-etc-networ.patch
upstream/0001-vxlan-fix-vni-filter.patch
+upstream/0001-python312-compat.patch
diff --git a/debian/patches/upstream/0001-python312-compat.patch b/debian/patches/upstream/0001-python312-compat.patch
new file mode 100644
index 0000000..c36482f
--- /dev/null
+++ b/debian/patches/upstream/0001-python312-compat.patch
@@ -0,0 +1,27 @@
+From fc0318378e878ffe639d1d1285936d1256dd67cf Mon Sep 17 00:00:00 2001
+From: Jan Huijsmans <huysmans@koffie.nu>
+Date: Tue, 9 Jul 2024 09:03:25 +0200
+Subject: [PATCH] Bug #296: python 3.12 compatibility
+
+Since python 3.2, readfp needs to be replaced by read_file.
+Python 3.12 dropped the readfp function.
+
+Patch provided as PR by me, as the original reporter failed to do
+so since 4-4-2024 and my systems break due to this issue.
+---
+ ifupdown2/ifupdown/main.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ifupdown2/ifupdown/main.py b/ifupdown2/ifupdown/main.py
+index 8e0f13f4..de6579ea 100644
+--- a/ifupdown2/ifupdown/main.py
++++ b/ifupdown2/ifupdown/main.py
+@@ -138,7 +138,7 @@ def read_config(self):
+ configStr = '[ifupdown2]\n' + config
+ configFP = io.StringIO(configStr)
+ parser = configparser.RawConfigParser()
+- parser.readfp(configFP)
++ parser.read_file(configFP)
+ configmap_g = dict(parser.items('ifupdown2'))
+
+ # Preprocess config map
--
2.47.0
--===============3737215794861617524==
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
--===============3737215794861617524==--