[pmg-devel] [PATCH pmg-api v2 0/2] remove outdated apt.conf.d and future-proof lintian

[pmg-devel] [PATCH pmg-api v2 0/2] remove outdated apt.conf.d and future-proof lintian

[Stoiko Ivanov]

changes v1->v2:
* incorporated Thomas' feedback (and remembered why i did put this off
  last time) - by not using the new 'remove-on-upgrade' flag for
  d/conffiles but rather the rm_conffile in d/maintscript
* this change works with current debhelper in both bullseye and
  bullseye-backports
* the second patch was added because I noticed the changes in lintian
  (from back-ports) - see [0] for some details.


[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1007002

Stoiko Ivanov (2):
  fix #3915: remove obsolete /etc/apt/apt.conf.d/75pmgconf
  d/lintian-overrides: add further future-proofing

 debian/lintian-overrides | 4 ++--
 debian/maintscript       | 3 +++
 src/Makefile             | 3 +--
 src/pmg-apt.conf         | 7 -------
 4 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 debian/maintscript
 delete mode 100644 src/pmg-apt.conf

-- 
2.30.2

[pmg-devel] [PATCH pmg-api v2 1/2] fix #3915: remove obsolete /etc/apt/apt.conf.d/75pmgconf

[Stoiko Ivanov]

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 <s.ivanov@proxmox.com>
---
 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

[pmg-devel] [PATCH pmg-api v2 2/2] d/lintian-overrides: add further future-proofing

[Stoiko Ivanov]

tested with lintian from bullseye and bullseye-backports

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/lintian-overrides | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 021726f..fbeb29c 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,4 +1,4 @@
 package-installs-apt-sources *etc/apt/sources.list.d/pmg-enterprise.list*
-uses-dpkg-database-directly usr/share/perl5/PMG/API2/APT.pm
-systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/pmgbanner.service getty.target
+uses-dpkg-database-directly *usr/share/perl5/PMG/API2/APT.pm*
+systemd-service-file-refers-to-unusual-wantedby-target *lib/systemd/system/pmgbanner.service*
 binary-without-manpage
-- 
2.30.2

[pmg-devel] applied-series: [PATCH pmg-api v2 0/2] remove outdated apt.conf.d and future-proof lintian

[Thomas Lamprecht]

Am 31/08/2022 um 19:06 schrieb Stoiko Ivanov:
> changes v1->v2:
> * incorporated Thomas' feedback (and remembered why i did put this off
>   last time) - by not using the new 'remove-on-upgrade' flag for
>   d/conffiles but rather the rm_conffile in d/maintscript
> * this change works with current debhelper in both bullseye and
>   bullseye-backports
> * the second patch was added because I noticed the changes in lintian
>   (from back-ports) - see [0] for some details.
> 
> 
> [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1007002
> 
> Stoiko Ivanov (2):
>   fix #3915: remove obsolete /etc/apt/apt.conf.d/75pmgconf
>   d/lintian-overrides: add further future-proofing
> 
>  debian/lintian-overrides | 4 ++--
>  debian/maintscript       | 3 +++
>  src/Makefile             | 3 +--
>  src/pmg-apt.conf         | 7 -------
>  4 files changed, 6 insertions(+), 11 deletions(-)
>  create mode 100644 debian/maintscript
>  delete mode 100644 src/pmg-apt.conf
> 

applied both patches, thanks!