split into two packages: a perl one and an acme.sh plugin one

Main reason for this split is PBS, which only needs the plugins and
would like to avoid the perl one (which pulls in pve-common too)

This includes a few small changes which are technically not direct
part of the split, but related enough:
* change source name of package from libproxmox-acme-perl to
  libproxmox-acme
* make lintian override for script exec permission narrower to avoid
  possible false negatives in the future, really only allow the
  dnsapi ones.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index e58f45e6c95c49156b98c2ab383119426869b13b..edbeb42b74cd92ea8c763caea63f6d627876eea1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
 include /usr/share/dpkg/pkg-info.mk
 
-PACKAGE=libproxmox-acme-perl
+SRC=libproxmox-acme
 
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+BUILDDIR ?= ${SRC}-${DEB_VERSION_UPSTREAM}
 GITVERSION:=$(shell git rev-parse HEAD)
 
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
-DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+DEB_PERL=libproxmox-acme-perl_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DEB_ACME_PLUGS=libproxmox-acme-plugins_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DEBS=${DEB_PERL} ${DEB_ACME_PLUGS}
+
+DSC=${SRC}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
 ACME_SUBMODULE="src/acme.sh"
 
@@ -24,10 +27,10 @@ ${BUILDDIR}: src debian submodule
        mv ${BUILDDIR}.tmp ${BUILDDIR}
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: ${BUILDDIR}
+deb: ${DEBS}
+${DEBS}: ${BUILDDIR}
        cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
-       lintian ${DEB}
+       lintian ${DEBS}
 
 .PHONY: dsc
 dsc: ${DSC}
@@ -35,13 +38,14 @@ ${DSC}: ${BUILDDIR}
        cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
        lintian ${DSC}
 
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: ${DEBS}
+       dpkg -i ${DEBS}
 
 .PHONY: clean
 clean:
-       rm -rf ${PACKAGE}-*/ ${BUILDDIR}.tmp *.deb *.buildinfo *.changes *.dsc *.tar.?z
+       rm -rf ${SRC}-*/ ${BUILDDIR}.tmp *.deb *.buildinfo *.changes *.dsc *.tar.?z
 
 .PHONY: upload
-upload: ${DEB}
-       tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch ${DEB_BUILD_ARCH}
+upload: ${DEBS}
+       tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch ${DEB_BUILD_ARCH}
+       tar cf - ${DEB_ACME_PLUGS}|ssh -X repoman@repo.proxmox.com -- upload --product pbs --dist buster --arch ${DEB_BUILD_ARCH}

diff --git a/debian/control b/debian/control
index b5f6519197d4a29107f4aa2973d91ffe93caf985..1017fdc1f9bfe0f3b2cbc8b244794553e32a2566 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libproxmox-acme-perl
+Source: libproxmox-acme
 Section: admin
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
@@ -8,14 +8,23 @@ Homepage: https://www.proxmox.com
 
 Package: libproxmox-acme-perl
 Architecture: all
-Depends: coreutils (>= 8.30-1),
-         curl (>= 7.64.0-1),
-         libpve-common-perl (>= 6~),
-         sed (>= 4.7-1),
+Depends: libpve-common-perl (>= 6~),
+         libproxmox-acme-plugins,
          ${perl:Depends},
          ${misc:Depends},
 Breaks: libpve-common-perl (<< 6.0-20),
 Replaces: libpve-common-perl (<< 6.0-20),
+Description: easy and small shell script to automatically issue
+ and renew the free certificates from Let's Encrypt.
+
+Package: libproxmox-acme-plugins
+Architecture: all
+Depends: coreutils (>= 8.30-1),
+         curl (>= 7.64.0-1),
+         sed (>= 4.7-1),
+         ${misc:Depends},
+Breaks: libproxmox-acme-perl (<< 1.1.0),
+Replaces: libproxmox-acme-perl (<< 1.1.0),
 Recommends: idn,
 Description: easy and small shell script to automatically issue
  and renew the free certificates from Let's Encrypt.

diff --git a/debian/libproxmox-acme-perl.install b/debian/libproxmox-acme-perl.install
new file mode 100644 (file)
index 0000000..e27abaf
--- /dev/null
+++ b/debian/libproxmox-acme-perl.install
@@ -0,0 +1 @@
+usr/share/perl5

diff --git a/debian/libproxmox-acme-plugins.install b/debian/libproxmox-acme-plugins.install
new file mode 100644 (file)
index 0000000..6225090
--- /dev/null
+++ b/debian/libproxmox-acme-plugins.install
@@ -0,0 +1 @@
+usr/share/proxmox-acme

diff --git a/debian/libproxmox-acme-plugins.lintian-overrides b/debian/libproxmox-acme-plugins.lintian-overrides
new file mode 100644 (file)
index 0000000..3cb9c46
--- /dev/null
+++ b/debian/libproxmox-acme-plugins.lintian-overrides
@@ -0,0 +1 @@
+libproxmox-acme-plugins: script-not-executable usr/share/proxmox-acme/dnsapi/*

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644 (file)
index 4f3e835..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libproxmox-acme-perl: script-not-executable
\ No newline at end of file