From 12fe9183cb82c3ea148ac31990c67b518c50aabf Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 4 Jul 2017 11:48:52 +0200 Subject: [PATCH] trust StartCom_Certification_Authority_2.crt --- Makefile | 5 ++++- debian/postinst | 5 ++++- debian/rules | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ecae4d888..210ac47c9 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,8 @@ $(DEB): echo "git clone git://git.proxmox.com/git/pve-manager.git\\ngit checkout ${GITVERSION}" > dest/debian/SOURCE cd dest; dpkg-buildpackage -b -us -uc # supress lintian error: statically-linked-binary usr/bin/pvemailforward - lintian -X binaries ${DEB} + # we have a certs in /usr/local/, so we need to disbale files check + lintian -X 'binaries,files' ${DEB} .PHONY: upload upload: ${DEB} check @@ -58,6 +59,8 @@ install: country.dat vzdump.conf vzdump-hook-script.pl pve-apt.conf mtu bridgevl install -d ${DESTDIR}/var/lib/vz/template/cache install -d ${DESTDIR}/var/lib/vz/template/iso install -d ${DESTDIR}/var/lib/vz/template/qemu + install -d ${DESTDIR}/usr/local/share/ca-certificates + install -m 0644 StartCom_Certification_Authority_2.crt ${DESTDIR}/usr/local/share/ca-certificates/startcom-ca2.crt install -D -m 0644 pve-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pveconf install -D -m 0644 pve-sources.list ${DESTDIR}/etc/apt/sources.list.d/pve-enterprise.list install -D -m 0644 pve-blacklist.conf ${DESTDIR}/etc/modprobe.d/pve-blacklist.conf diff --git a/debian/postinst b/debian/postinst index aa30f708e..3f1c1b6f8 100755 --- a/debian/postinst +++ b/debian/postinst @@ -133,7 +133,10 @@ EOF deb-systemd-invoke start pvesr.timer >/dev/null || true fi - + + # enable startcom-ca2.crt for enterprise repository + update-ca-certificates >/dev/null 2>&1 + # rewrite banner test -e /proxmox_install_mode || pvebanner || true diff --git a/debian/rules b/debian/rules index b9eb7da00..9ce613884 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,9 @@ override_dh_compress: override_dh_strip_nondeterminism: dh_strip_nondeterminism -X.png +override_dh_usrlocal: + # do nothing + override_dh_fixperms: dh_fixperms find debian -name 'pvemailforward' -exec chmod 2755 {} +