From 22ec89c7d2a8cb71e0322389fd6c017a04bfd573 Mon Sep 17 00:00:00 2001 From: jiangcuo Date: Mon, 2 Dec 2024 10:39:55 +0800 Subject: [PATCH] bump pve-manager to 8.3.1 --- .../patches/003-add-pveport-source.patch | 28 +++++++++---- .../patches/010-set-architecture-to-any.patch | 29 +++++++++++++ ...3-add-pveport-source-looon64-riscv64.patch | 42 +++++++++++++++++++ packages/pve-manager/pve-manager | 2 +- packages/pve-manager/series | 1 + packages/pve-manager/series.aarch64 | 0 packages/pve-manager/series.loongarch64 | 1 + packages/pve-manager/series.riscv64 | 1 + 8 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 packages/pve-manager/patches/010-set-architecture-to-any.patch create mode 100644 packages/pve-manager/patches/other/003-add-pveport-source-looon64-riscv64.patch create mode 100644 packages/pve-manager/series.aarch64 create mode 100644 packages/pve-manager/series.loongarch64 create mode 100644 packages/pve-manager/series.riscv64 diff --git a/packages/pve-manager/patches/003-add-pveport-source.patch b/packages/pve-manager/patches/003-add-pveport-source.patch index e8f4734..3348116 100644 --- a/packages/pve-manager/patches/003-add-pveport-source.patch +++ b/packages/pve-manager/patches/003-add-pveport-source.patch @@ -1,25 +1,36 @@ diff --git a/configs/Makefile b/configs/Makefile -index fa586e280..698a91b5a 100644 +index fa586e28..d72a466b 100644 --- a/configs/Makefile +++ b/configs/Makefile -@@ -8,7 +8,7 @@ country.dat: country.pl +@@ -6,9 +6,9 @@ country.dat: country.pl + ./country.pl > country.dat + .PHONY: install - install: country.dat vzdump.conf pve-sources.list pve-initramfs.conf pve-blacklist.conf pve.logrotate +-install: country.dat vzdump.conf pve-sources.list pve-initramfs.conf pve-blacklist.conf pve.logrotate ++install: country.dat vzdump.conf pveport.list pve-initramfs.conf pve-blacklist.conf pve.logrotate install -D -m 0644 pve.logrotate $(DESTDIR)/etc/logrotate.d/pve - install -D -m 0644 pve-sources.list $(DESTDIR)/etc/apt/sources.list.d/pve-enterprise.list -+ install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pveport.list ++ install -D -m 0644 pveport.list $(DESTDIR)/etc/apt/sources.list.d/pveport.list install -D -m 0644 pve-blacklist.conf $(DESTDIR)/etc/modprobe.d/pve-blacklist.conf install -D -m 0644 vzdump.conf $(DESTDIR)/etc/vzdump.conf install -D -m 0644 pve-initramfs.conf $(DESTDIR)/etc/initramfs-tools/conf.d/pve-initramfs.conf diff --git a/configs/pve-sources.list b/configs/pve-sources.list -index 010385a97..eeae1c0d8 100644 +deleted file mode 100644 +index 010385a9..00000000 --- a/configs/pve-sources.list -+++ b/configs/pve-sources.list -@@ -1 +1 @@ ++++ /dev/null +@@ -1 +0,0 @@ -deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise +diff --git a/configs/pveport.list b/configs/pveport.list +new file mode 100644 +index 00000000..635f88c7 +--- /dev/null ++++ b/configs/pveport.list +@@ -0,0 +1 @@ +deb https://mirrors.apqa.cn/proxmox/debian/pve bookworm port +\ No newline at end of file diff --git a/debian/lintian-overrides b/debian/lintian-overrides -index fb9cc49de..f9731f490 100644 +index fb9cc49d..f9731f49 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -3,5 +3,5 @@ pve-manager: no-manual-page [usr/bin/pvebanner] @@ -29,4 +40,3 @@ index fb9cc49de..f9731f490 100644 -pve-manager: package-installs-apt-sources [etc/apt/sources.list.d/pve-enterprise.list] +pve-manager: package-installs-apt-sources [etc/apt/sources.list.d/pveport.list] pve-manager: privacy-breach-generic usr/share/pve-manager/touch/sencha-touch-all-debug.js * - diff --git a/packages/pve-manager/patches/010-set-architecture-to-any.patch b/packages/pve-manager/patches/010-set-architecture-to-any.patch new file mode 100644 index 0000000..6aea19f --- /dev/null +++ b/packages/pve-manager/patches/010-set-architecture-to-any.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile b/Makefile +index fbd75f51..1d668155 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,8 +6,10 @@ export VERSION = $(DEB_VERSION_UPSTREAM_REVISION) + + BUILDDIR = $(PACKAGE)-$(DEB_VERSION_UPSTREAM) + ++ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) ++ + DSC=$(PACKAGE)_$(DEB_VERSION).dsc +-DEB=$(PACKAGE)_$(DEB_VERSION)_all.deb ++DEB=$(PACKAGE)_$(DEB_VERSION)_$(ARCH).deb + + DESTDIR= + SUBDIRS = aplinfo PVE bin www services configs network-hooks test templates +diff --git a/debian/control b/debian/control +index 6c94df09..f13c04dc 100644 +--- a/debian/control ++++ b/debian/control +@@ -34,7 +34,7 @@ Maintainer: Proxmox Support Team + Package: pve-manager + Section: admin + Priority: optional +-Architecture: all ++Architecture: any + Depends: apt (>= 1.5~), + ca-certificates, + cstream, diff --git a/packages/pve-manager/patches/other/003-add-pveport-source-looon64-riscv64.patch b/packages/pve-manager/patches/other/003-add-pveport-source-looon64-riscv64.patch new file mode 100644 index 0000000..bea238e --- /dev/null +++ b/packages/pve-manager/patches/other/003-add-pveport-source-looon64-riscv64.patch @@ -0,0 +1,42 @@ +diff --git a/configs/Makefile b/configs/Makefile +index fa586e28..d72a466b 100644 +--- a/configs/Makefile ++++ b/configs/Makefile +@@ -6,9 +6,9 @@ country.dat: country.pl + ./country.pl > country.dat + + .PHONY: install +-install: country.dat vzdump.conf pve-sources.list pve-initramfs.conf pve-blacklist.conf pve.logrotate ++install: country.dat vzdump.conf pveport.list pve-initramfs.conf pve-blacklist.conf pve.logrotate + install -D -m 0644 pve.logrotate $(DESTDIR)/etc/logrotate.d/pve +- install -D -m 0644 pve-sources.list $(DESTDIR)/etc/apt/sources.list.d/pve-enterprise.list ++ install -D -m 0644 pveport.list $(DESTDIR)/etc/apt/sources.list.d/pveport.list + install -D -m 0644 pve-blacklist.conf $(DESTDIR)/etc/modprobe.d/pve-blacklist.conf + install -D -m 0644 vzdump.conf $(DESTDIR)/etc/vzdump.conf + install -D -m 0644 pve-initramfs.conf $(DESTDIR)/etc/initramfs-tools/conf.d/pve-initramfs.conf +diff --git a/configs/pve-sources.list b/configs/pve-sources.list +deleted file mode 100644 +index 010385a9..00000000 +--- a/configs/pve-sources.list ++++ /dev/null +@@ -1 +0,0 @@ +-deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise +diff --git a/configs/pveport.list b/configs/pveport.list +new file mode 100644 +index 00000000..635f88c7 +--- /dev/null ++++ b/configs/pveport.list +@@ -0,0 +1 @@ ++deb https://mirrors.lierfang.com/proxmox/debian/pve sid port +\ No newline at end of file +diff --git a/debian/lintian-overrides b/debian/lintian-overrides +index fb9cc49d..f9731f49 100644 +--- a/debian/lintian-overrides ++++ b/debian/lintian-overrides +@@ -3,5 +3,5 @@ pve-manager: no-manual-page [usr/bin/pvebanner] + pve-manager: no-manual-page [usr/bin/pveupdate] + pve-manager: non-standard-dir-perm 0700 != 0755 [var/log/pveproxy/] + pve-manager: systemd-service-file-refers-to-unusual-wantedby-target getty.target [lib/systemd/system/pvebanner.service] +-pve-manager: package-installs-apt-sources [etc/apt/sources.list.d/pve-enterprise.list] ++pve-manager: package-installs-apt-sources [etc/apt/sources.list.d/pveport.list] + pve-manager: privacy-breach-generic usr/share/pve-manager/touch/sencha-touch-all-debug.js * diff --git a/packages/pve-manager/pve-manager b/packages/pve-manager/pve-manager index 813c644..fb48e85 160000 --- a/packages/pve-manager/pve-manager +++ b/packages/pve-manager/pve-manager @@ -1 +1 @@ -Subproject commit 813c6446ff77aa4487c21484b6cdd0555aa44389 +Subproject commit fb48e850ef9dde2726668ec1db0a605dcd5b7b22 diff --git a/packages/pve-manager/series b/packages/pve-manager/series index ae0bbf5..580d741 100644 --- a/packages/pve-manager/series +++ b/packages/pve-manager/series @@ -7,3 +7,4 @@ patches/007-remove-amd64-config.patch patches/008-add-arm64-config.patch patches/009-remove-other-ostype.patch patches/changelog/004-add-changelog-8.1.3+pve1.patch +patches/010-set-architecture-to-any.patch diff --git a/packages/pve-manager/series.aarch64 b/packages/pve-manager/series.aarch64 new file mode 100644 index 0000000..e69de29 diff --git a/packages/pve-manager/series.loongarch64 b/packages/pve-manager/series.loongarch64 new file mode 100644 index 0000000..671f395 --- /dev/null +++ b/packages/pve-manager/series.loongarch64 @@ -0,0 +1 @@ +patches/other/003-add-pveport-source-looon64-riscv64.patch diff --git a/packages/pve-manager/series.riscv64 b/packages/pve-manager/series.riscv64 new file mode 100644 index 0000000..671f395 --- /dev/null +++ b/packages/pve-manager/series.riscv64 @@ -0,0 +1 @@ +patches/other/003-add-pveport-source-looon64-riscv64.patch