From b20cce03aa72e40c6e03554163c2cefa8ea0053c Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Fri, 10 Jul 2020 01:04:06 +0200 Subject: [PATCH] Add dev dependencies to build cffi and cryptography --- certbot-dns-cloudflare/snap/snapcraft.yaml | 2 ++ certbot-dns-cloudxns/snap/snapcraft.yaml | 2 ++ certbot-dns-digitalocean/snap/snapcraft.yaml | 2 ++ certbot-dns-dnsimple/snap/snapcraft.yaml | 2 ++ certbot-dns-dnsmadeeasy/snap/snapcraft.yaml | 2 ++ certbot-dns-gehirn/snap/snapcraft.yaml | 2 ++ certbot-dns-google/snap/snapcraft.yaml | 2 ++ certbot-dns-linode/snap/snapcraft.yaml | 2 ++ certbot-dns-luadns/snap/snapcraft.yaml | 2 ++ certbot-dns-nsone/snap/snapcraft.yaml | 2 ++ certbot-dns-ovh/snap/snapcraft.yaml | 2 ++ certbot-dns-rfc2136/snap/snapcraft.yaml | 2 ++ certbot-dns-route53/snap/snapcraft.yaml | 2 ++ certbot-dns-sakuracloud/snap/snapcraft.yaml | 2 ++ tools/{ => snap}/generate_dnsplugins_snapcraft.sh | 4 +++- 15 files changed, 31 insertions(+), 1 deletion(-) rename tools/{ => snap}/generate_dnsplugins_snapcraft.sh (87%) diff --git a/certbot-dns-cloudflare/snap/snapcraft.yaml b/certbot-dns-cloudflare/snap/snapcraft.yaml index 97d1dab42..2a99449cd 100644 --- a/certbot-dns-cloudflare/snap/snapcraft.yaml +++ b/certbot-dns-cloudflare/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-cloudxns/snap/snapcraft.yaml b/certbot-dns-cloudxns/snap/snapcraft.yaml index fb60590eb..790904034 100644 --- a/certbot-dns-cloudxns/snap/snapcraft.yaml +++ b/certbot-dns-cloudxns/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-digitalocean/snap/snapcraft.yaml b/certbot-dns-digitalocean/snap/snapcraft.yaml index 40d05311f..d237b0248 100644 --- a/certbot-dns-digitalocean/snap/snapcraft.yaml +++ b/certbot-dns-digitalocean/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-dnsimple/snap/snapcraft.yaml b/certbot-dns-dnsimple/snap/snapcraft.yaml index 2d1d53e02..5996fce75 100644 --- a/certbot-dns-dnsimple/snap/snapcraft.yaml +++ b/certbot-dns-dnsimple/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml b/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml index da6ba93be..ce60a9e5e 100644 --- a/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml +++ b/certbot-dns-dnsmadeeasy/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-gehirn/snap/snapcraft.yaml b/certbot-dns-gehirn/snap/snapcraft.yaml index be664e597..c4c44d432 100644 --- a/certbot-dns-gehirn/snap/snapcraft.yaml +++ b/certbot-dns-gehirn/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-google/snap/snapcraft.yaml b/certbot-dns-google/snap/snapcraft.yaml index ead90696c..79176fa57 100644 --- a/certbot-dns-google/snap/snapcraft.yaml +++ b/certbot-dns-google/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-linode/snap/snapcraft.yaml b/certbot-dns-linode/snap/snapcraft.yaml index 3895270dc..8c90f2659 100644 --- a/certbot-dns-linode/snap/snapcraft.yaml +++ b/certbot-dns-linode/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-luadns/snap/snapcraft.yaml b/certbot-dns-luadns/snap/snapcraft.yaml index 701fd76ff..afb478731 100644 --- a/certbot-dns-luadns/snap/snapcraft.yaml +++ b/certbot-dns-luadns/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-nsone/snap/snapcraft.yaml b/certbot-dns-nsone/snap/snapcraft.yaml index 602a8dd03..bcb9401eb 100644 --- a/certbot-dns-nsone/snap/snapcraft.yaml +++ b/certbot-dns-nsone/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-ovh/snap/snapcraft.yaml b/certbot-dns-ovh/snap/snapcraft.yaml index 2949e7951..102b77470 100644 --- a/certbot-dns-ovh/snap/snapcraft.yaml +++ b/certbot-dns-ovh/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-rfc2136/snap/snapcraft.yaml b/certbot-dns-rfc2136/snap/snapcraft.yaml index 762976f52..6fde709d6 100644 --- a/certbot-dns-rfc2136/snap/snapcraft.yaml +++ b/certbot-dns-rfc2136/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-route53/snap/snapcraft.yaml b/certbot-dns-route53/snap/snapcraft.yaml index a9f23730d..cf811a249 100644 --- a/certbot-dns-route53/snap/snapcraft.yaml +++ b/certbot-dns-route53/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/certbot-dns-sakuracloud/snap/snapcraft.yaml b/certbot-dns-sakuracloud/snap/snapcraft.yaml index bc433c8aa..657447efd 100644 --- a/certbot-dns-sakuracloud/snap/snapcraft.yaml +++ b/certbot-dns-sakuracloud/snap/snapcraft.yaml @@ -16,6 +16,8 @@ parts: snapcraftctl set-version `grep ^version $SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: diff --git a/tools/generate_dnsplugins_snapcraft.sh b/tools/snap/generate_dnsplugins_snapcraft.sh similarity index 87% rename from tools/generate_dnsplugins_snapcraft.sh rename to tools/snap/generate_dnsplugins_snapcraft.sh index 2e367f89b..f97c7c010 100755 --- a/tools/generate_dnsplugins_snapcraft.sh +++ b/tools/snap/generate_dnsplugins_snapcraft.sh @@ -3,7 +3,7 @@ set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -CERTBOT_DIR="$(dirname "${DIR}")" +CERTBOT_DIR="$(dirname $(dirname "${DIR}"))" for PLUGIN_PATH in "${CERTBOT_DIR}"/certbot-dns-*; do PLUGIN=$(basename "${PLUGIN_PATH}") @@ -28,6 +28,8 @@ parts: snapcraftctl set-version \`grep ^version \$SNAPCRAFT_PART_SRC/setup.py | cut -f2 -d= | tr -d "'[:space:]"\` build-environment: - EXCLUDE_CERTBOT_DEPS: "True" + # To build cryptography and cffi if needed + build-packages: [libffi-dev, libssl-dev, python3-dev] slots: certbot: