From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 B4AE0903D6 for ; Wed, 31 Aug 2022 19:06:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2D8E1F499 for ; Wed, 31 Aug 2022 19:06:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 31 Aug 2022 19:06:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D2B4543603 for ; Wed, 31 Aug 2022 19:06:43 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 31 Aug 2022 19:06:29 +0200 Message-Id: <20220831170630.171069-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220831170630.171069-1-s.ivanov@proxmox.com> References: <20220831170630.171069-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.190 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] [PATCH pmg-api v2 1/2] fix #3915: remove obsolete /etc/apt/apt.conf.d/75pmgconf X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Aug 2022 17:06:51 -0000 this was forgotten when introducing the more flexible kernel-keeping logic with proxmox-boot-tool (in 6.4). with this file present no pve-kernel gets autoremoved. this patch uses d/maintscript for removing instead of using debian/conffiles (deb-conffiles(5)) 'remove-on-upgrade' sticking with d/maintscript was chosen, since else it depends on the installed debhelper version if the removal is done at all (debhelper from bullseye simply ignores remove-on-upgrade in d/conffiles) Tested the following with a local version bump to 7.1-5 and a VM: * regular unchanged /etc/apt/apt.conf.d/75pmgconf * manually modified /etc/apt/apt.conf.d/75pmgconf * manually removed /etc/apt/apt.conf.d/75pmgconf Signed-off-by: Stoiko Ivanov --- debian/maintscript | 3 +++ src/Makefile | 3 +-- src/pmg-apt.conf | 7 ------- 3 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 debian/maintscript delete mode 100644 src/pmg-apt.conf diff --git a/debian/maintscript b/debian/maintscript new file mode 100644 index 0000000..5656aa7 --- /dev/null +++ b/debian/maintscript @@ -0,0 +1,3 @@ +# FIXME: remove in 8.0 +rm_conffile /etc/apt/apt.conf.d/75pmgconf 7.1-5~ pmg-api + diff --git a/src/Makefile b/src/Makefile index f08be0f..49c7974 100644 --- a/src/Makefile +++ b/src/Makefile @@ -164,7 +164,7 @@ LIBSOURCES = \ PMG/API2/NodeConfig.pm \ PMG/API2.pm \ -SOURCES = ${LIBSOURCES} ${CLI_BINARIES} ${TEMPLATES_FILES} ${CONF_MANS} ${CLI_MANS} ${SERVICE_MANS} ${SERVICE_UNITS} ${TIMER_UNITS} pmg-sources.list pmg-apt.conf pmg-initramfs.conf +SOURCES = ${LIBSOURCES} ${CLI_BINARIES} ${TEMPLATES_FILES} ${CONF_MANS} ${CLI_MANS} ${SERVICE_MANS} ${SERVICE_UNITS} ${TIMER_UNITS} pmg-sources.list pmg-initramfs.conf all: ${SOURCES} @@ -189,7 +189,6 @@ install: ${SOURCES} $(addsuffix .service-bash-completion, ${SERVICES}) $(addsuff install -d -m 0755 ${DOCDIR} # TODO: is there a better location ? install -m 0644 favicon.ico ${DOCDIR} - install -D -m 0644 pmg-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pmgconf install -D -m 0644 pmg-sources.list ${DESTDIR}/etc/apt/sources.list.d/pmg-enterprise.list for i in ${LIBSOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/$$i; done for i in ${SERVICES}; do install -D -m 0644 PMG/Service/$$i.pm ${PERL5DIR}/PMG/Service/$$i.pm; done diff --git a/src/pmg-apt.conf b/src/pmg-apt.conf deleted file mode 100644 index 0391b74..0000000 --- a/src/pmg-apt.conf +++ /dev/null @@ -1,7 +0,0 @@ -APT -{ - NeverAutoRemove - { - "^pve-kernel-.*"; - }; -} -- 2.30.2