From efa80b7d5178ebc55231f04a648986fed0c71e9f Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 23 Jul 2021 12:18:31 -0700 Subject: [PATCH] Stick with 9.6 and higher --- .github/workflows/ci.yml | 1 - pkg/debian_10_amd64/DEBIAN/control | 3 +-- pkg/debian_10_arm64/DEBIAN/control | 2 +- pkg/rpm_shared/rpmbuild/SPECS/firezone.spec | 2 +- pkg/ubuntu_18.04_amd64/DEBIAN/control | 2 +- pkg/ubuntu_18.04_arm64/DEBIAN/control | 2 +- pkg/ubuntu_20.04_amd64/DEBIAN/control | 2 +- pkg/ubuntu_20.04_arm64/DEBIAN/control | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbb99a7a6..35093638c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: - ubuntu-20.04 - ubuntu-18.04 postgres: - - postgres:9.2 - postgres:9.6 - postgres:10 - postgres:11 diff --git a/pkg/debian_10_amd64/DEBIAN/control b/pkg/debian_10_amd64/DEBIAN/control index 840d2fb8c..c7a60f0a5 100644 --- a/pkg/debian_10_amd64/DEBIAN/control +++ b/pkg/debian_10_amd64/DEBIAN/control @@ -2,8 +2,7 @@ Package: firezone Version: 0.2.0-1 Architecture: amd64 Maintainer: FireZone LLC -Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.2), iptables (>= 1.6.1) - +Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.6), iptables (>= 1.6.1) Section: net Priority: optional Homepage: https://firez.one diff --git a/pkg/debian_10_arm64/DEBIAN/control b/pkg/debian_10_arm64/DEBIAN/control index 6e063145e..8439dae2b 100644 --- a/pkg/debian_10_arm64/DEBIAN/control +++ b/pkg/debian_10_arm64/DEBIAN/control @@ -2,7 +2,7 @@ Package: firezone Version: 0.2.0-1 Architecture: arm64 Maintainer: FireZone LLC -Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.2), iptables (>= 1.6.1) +Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.6), iptables (>= 1.6.1) Section: net Priority: optional Homepage: https://firez.one diff --git a/pkg/rpm_shared/rpmbuild/SPECS/firezone.spec b/pkg/rpm_shared/rpmbuild/SPECS/firezone.spec index 09e7f749e..531f8a955 100644 --- a/pkg/rpm_shared/rpmbuild/SPECS/firezone.spec +++ b/pkg/rpm_shared/rpmbuild/SPECS/firezone.spec @@ -7,7 +7,7 @@ License: ASL 2.0 Requires: libc6 Requires: net-tools Requires: wireguard-tools -Requires: postgresql-server +Requires: postgresql-server >= 9.6 Requires: openssl Requires: systemd Requires: iptables diff --git a/pkg/ubuntu_18.04_amd64/DEBIAN/control b/pkg/ubuntu_18.04_amd64/DEBIAN/control index 5757caf4a..fbdd6e504 100644 --- a/pkg/ubuntu_18.04_amd64/DEBIAN/control +++ b/pkg/ubuntu_18.04_amd64/DEBIAN/control @@ -2,7 +2,7 @@ Package: firezone Version: 0.2.0-1 Architecture: amd64 Maintainer: FireZone, LLC -Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.2), iptables (>= 1.6.1) +Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.6), iptables (>= 1.6.1) Section: net Priority: optional Homepage: https://firez.one diff --git a/pkg/ubuntu_18.04_arm64/DEBIAN/control b/pkg/ubuntu_18.04_arm64/DEBIAN/control index 6463d5d6f..ad2ad00c8 100644 --- a/pkg/ubuntu_18.04_arm64/DEBIAN/control +++ b/pkg/ubuntu_18.04_arm64/DEBIAN/control @@ -2,7 +2,7 @@ Package: firezone Version: 0.2.0-1 Architecture: arm64 Maintainer: FireZone, LLC -Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.2), iptables (>= 1.6.1) +Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.6), iptables (>= 1.6.1) Section: net Priority: optional Homepage: https://firez.one diff --git a/pkg/ubuntu_20.04_amd64/DEBIAN/control b/pkg/ubuntu_20.04_amd64/DEBIAN/control index f33baf2ac..18f1e106d 100644 --- a/pkg/ubuntu_20.04_amd64/DEBIAN/control +++ b/pkg/ubuntu_20.04_amd64/DEBIAN/control @@ -2,7 +2,7 @@ Package: firezone Version: 0.2.0-1 Architecture: amd64 Maintainer: FireZone, LLC -Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.2), iptables (>= 1.6.1) +Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.6), iptables (>= 1.6.1) Section: net Priority: optional Homepage: https://firez.one diff --git a/pkg/ubuntu_20.04_arm64/DEBIAN/control b/pkg/ubuntu_20.04_arm64/DEBIAN/control index 9f2b184ed..5a00a2966 100644 --- a/pkg/ubuntu_20.04_arm64/DEBIAN/control +++ b/pkg/ubuntu_20.04_arm64/DEBIAN/control @@ -2,7 +2,7 @@ Package: firezone Version: 0.2.0-1 Architecture: arm64 Maintainer: FireZone, LLC -Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.2), iptables (>= 1.6.1) +Depends: libc6, net-tools (>= 1.60), systemd (>= 237), openssl (>= 1.1.1), wireguard-tools (>= 1.0), postgresql (>= 9.6), iptables (>= 1.6.1) Section: net Priority: optional Homepage: https://firez.one