|
 |
cf2e798 |
From 86a6b02e4b95ab3629446e71895cc5e57ad4482f Mon Sep 17 00:00:00 2001
|
|
|
cf2e798 |
From: Peter Jones <pjones@redhat.com>
|
|
|
cf2e798 |
Date: Mon, 14 Aug 2017 11:37:43 -0400
|
|
|
cf2e798 |
Subject: [PATCH 29/29] Make macros.pesign error in kojibuilder if we don't
|
|
|
cf2e798 |
have perms on the socket
|
|
|
cf2e798 |
|
|
|
cf2e798 |
---
|
|
|
cf2e798 |
src/macros.pesign | 9 +++++++++
|
|
|
cf2e798 |
1 file changed, 9 insertions(+)
|
|
|
cf2e798 |
|
|
|
cf2e798 |
diff --git a/src/macros.pesign b/src/macros.pesign
|
|
|
cf2e798 |
index 22a3ee6..1665b4c 100644
|
|
|
cf2e798 |
--- a/src/macros.pesign
|
|
|
cf2e798 |
+++ b/src/macros.pesign
|
|
|
cf2e798 |
@@ -43,6 +43,21 @@
|
|
|
cf2e798 |
%{_pesign} -R ${sattrs}.sig -I ${sattrs} %{-i} \\\
|
|
|
cf2e798 |
--certdir ${nss} -c signer %{-o} \
|
|
|
cf2e798 |
rm -rf ${sattrs} ${sattrs}.sig ${nss} \
|
|
|
cf2e798 |
+ elif [ "%{vendor}" == "Fedora Project" -a \\\
|
|
|
cf2e798 |
+ "$(id -un)" == "mockbuild" -a \\\
|
|
|
cf2e798 |
+ "$(uname -m)" == "x86_64" ] && \\\
|
|
|
cf2e798 |
+ grep -q ID=fedora /etc/os-release && \\\
|
|
|
cf2e798 |
+ [[ "%{_buildhost}" =~ ^bkernel.* ]] && \\\
|
|
|
cf2e798 |
+ ! [ -S /var/run/pesign/socket ]; then \
|
|
|
721793f |
+ echo "No socket even though this is %{_buildhost}" \
|
|
|
cf2e798 |
+ ls -ld /var/run/pesign || : \
|
|
|
cf2e798 |
+ getfacl /var/run/pesign || : \
|
|
|
cf2e798 |
+ ls -l /var/run/pesign/socket || : \
|
|
|
cf2e798 |
+ getfacl /var/run/pesign/socket || : \
|
|
|
cf2e798 |
+ echo =========== env ============== \
|
|
|
cf2e798 |
+ set \
|
|
|
cf2e798 |
+ echo =========== env ============== \
|
|
|
cf2e798 |
+ exit 1 \
|
|
|
cf2e798 |
elif [ -S /var/run/pesign/socket ]; then \
|
|
|
cf2e798 |
%{_pesign_client} -t %{__pesign_client_token} \\\
|
|
|
cf2e798 |
-c %{__pesign_client_cert} \\\
|
|
|
cf2e798 |
--
|
|
|
cf2e798 |
2.13.4
|
|
|
cf2e798 |
|