proxmox-mirrors/proxmox-acme
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-acme synced 2025-05-29 15:02:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Thomas Lamprecht 2021-05-05 09:49:17 +02:00
parent 4195bf0a9a
commit a19ae07bfb
6 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -1,12 +1,15 @@
include /usr/share/dpkg/pkg-info.mk 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) GITVERSION:=$(shell git rev-parse HEAD)
DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb DEB_PERL=libproxmox-acme-perl_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc 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" ACME_SUBMODULE="src/acme.sh"
@ -24,10 +27,10 @@ ${BUILDDIR}: src debian submodule
mv ${BUILDDIR}.tmp ${BUILDDIR} mv ${BUILDDIR}.tmp ${BUILDDIR}
.PHONY: deb .PHONY: deb
deb: ${DEB} deb: ${DEBS}
${DEB}: ${BUILDDIR} ${DEBS}: ${BUILDDIR}
cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
lintian ${DEB} lintian ${DEBS}
.PHONY: dsc .PHONY: dsc
dsc: ${DSC} dsc: ${DSC}
@ -35,13 +38,14 @@ ${DSC}: ${BUILDDIR}
cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d cd ${BUILDDIR}; dpkg-buildpackage -S -us -uc -d
lintian ${DSC} lintian ${DSC}
dinstall: ${DEB} dinstall: ${DEBS}
dpkg -i ${DEB} dpkg -i ${DEBS}
.PHONY: clean .PHONY: clean
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 .PHONY: upload
upload: ${DEB} upload: ${DEBS}
tar cf - ${DEB}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist buster --arch ${DEB_BUILD_ARCH} 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}

19
debian/control vendored
View File

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

1
debian/libproxmox-acme-perl.install vendored Normal file
View File

@ -0,0 +1 @@
usr/share/perl5

1
debian/libproxmox-acme-plugins.install vendored Normal file
View File

@ -0,0 +1 @@
usr/share/proxmox-acme

1
debian/libproxmox-acme-plugins.lintian-overrides vendored Normal file
View File

@ -0,0 +1 @@
libproxmox-acme-plugins: script-not-executable usr/share/proxmox-acme/dnsapi/*

1
debian/lintian-overrides vendored
View File

@ -1 +0,0 @@
libproxmox-acme-perl: script-not-executable