trust StartCom_Certification_Authority_2.crt

diff --git a/Makefile b/Makefile
index ecae4d888d07b05e56611f1dbae764b45f76f6fe..210ac47c9d4557901a509e1721f7f9c11abc9a29 100644 (file)
--- 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 aa30f708ead4b200f51c1a496f6dba183a4b847a..3f1c1b6f888fcd9a91c00c8013a626fd3fc0542c 100755 (executable)
--- 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 b9eb7da004a3bb2a2f7970595f7483e5426d33ce..9ce613884cb05dcf00a431ea5b46c0fbd87fc4ac 100755 (executable)
--- 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 {} +