From aa348cb2e97bc3093ff15c93c43e57884aebf3bc Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@freedom.press>
Date: Tue, 1 Oct 2024 03:08:53 -0700
Subject: [PATCH 1/2] Update packages to 0.7.1

---
 dangerzone/f39/dangerzone-0.7.0-1.fc39.src.rpm          | 3 ---
 dangerzone/f39/dangerzone-0.7.0-1.fc39.x86_64.rpm       | 3 ---
 dangerzone/f39/dangerzone-0.7.1-1.fc39.src.rpm          | 3 +++
 dangerzone/f39/dangerzone-0.7.1-1.fc39.x86_64.rpm       | 3 +++
 dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.src.rpm    | 3 ---
 dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.x86_64.rpm | 3 ---
 dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.src.rpm    | 3 +++
 dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.x86_64.rpm | 3 +++
 dangerzone/f40/dangerzone-0.7.0-1.fc40.src.rpm          | 3 ---
 dangerzone/f40/dangerzone-0.7.0-1.fc40.x86_64.rpm       | 3 ---
 dangerzone/f40/dangerzone-0.7.1-1.fc40.src.rpm          | 3 +++
 dangerzone/f40/dangerzone-0.7.1-1.fc40.x86_64.rpm       | 3 +++
 dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.src.rpm    | 3 ---
 dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.x86_64.rpm | 3 ---
 dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.src.rpm    | 3 +++
 dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.x86_64.rpm | 3 +++
 16 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 dangerzone/f39/dangerzone-0.7.0-1.fc39.src.rpm
 delete mode 100644 dangerzone/f39/dangerzone-0.7.0-1.fc39.x86_64.rpm
 create mode 100644 dangerzone/f39/dangerzone-0.7.1-1.fc39.src.rpm
 create mode 100644 dangerzone/f39/dangerzone-0.7.1-1.fc39.x86_64.rpm
 delete mode 100644 dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.src.rpm
 delete mode 100644 dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.x86_64.rpm
 create mode 100644 dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.src.rpm
 create mode 100644 dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.x86_64.rpm
 delete mode 100644 dangerzone/f40/dangerzone-0.7.0-1.fc40.src.rpm
 delete mode 100644 dangerzone/f40/dangerzone-0.7.0-1.fc40.x86_64.rpm
 create mode 100644 dangerzone/f40/dangerzone-0.7.1-1.fc40.src.rpm
 create mode 100644 dangerzone/f40/dangerzone-0.7.1-1.fc40.x86_64.rpm
 delete mode 100644 dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.src.rpm
 delete mode 100644 dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.x86_64.rpm
 create mode 100644 dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.src.rpm
 create mode 100644 dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.x86_64.rpm

diff --git a/dangerzone/f39/dangerzone-0.7.0-1.fc39.src.rpm b/dangerzone/f39/dangerzone-0.7.0-1.fc39.src.rpm
deleted file mode 100644
index 8b851dd..0000000
--- a/dangerzone/f39/dangerzone-0.7.0-1.fc39.src.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:914e17441777a290c062fefd466a9bb9eea7995d3efdd84147bac169dc68419d
-size 692592613
diff --git a/dangerzone/f39/dangerzone-0.7.0-1.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-0.7.0-1.fc39.x86_64.rpm
deleted file mode 100644
index aabc43a..0000000
--- a/dangerzone/f39/dangerzone-0.7.0-1.fc39.x86_64.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42a64816cca80d1266f29edef7c3dd10a6f0848f3c9f565eae86b085fc2bcd23
-size 689420956
diff --git a/dangerzone/f39/dangerzone-0.7.1-1.fc39.src.rpm b/dangerzone/f39/dangerzone-0.7.1-1.fc39.src.rpm
new file mode 100644
index 0000000..a04f067
--- /dev/null
+++ b/dangerzone/f39/dangerzone-0.7.1-1.fc39.src.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f63d3fdb6e5b7c7b35438d67566ff7745ab6bb38426661deeb6923a756361134
+size 690443554
diff --git a/dangerzone/f39/dangerzone-0.7.1-1.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-0.7.1-1.fc39.x86_64.rpm
new file mode 100644
index 0000000..0352587
--- /dev/null
+++ b/dangerzone/f39/dangerzone-0.7.1-1.fc39.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df4331dcbae9a01fd99fd079aba7e2b505a70a233a646d4772d67d2f3672f826
+size 687238375
diff --git a/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.src.rpm b/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.src.rpm
deleted file mode 100644
index 263c405..0000000
--- a/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.src.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ea479b8bad2213f774e1f3d90c0a8b3cccdb5978211cf4d384bcd41f3bd2a4e
-size 162580
diff --git a/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.x86_64.rpm
deleted file mode 100644
index 3e627f5..0000000
--- a/dangerzone/f39/dangerzone-qubes-0.7.0-1.fc39.x86_64.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6aed22e14a1d73c2ae3934ac382a6f178ec808d019dd6d8ec8506f363f270381
-size 227718
diff --git a/dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.src.rpm b/dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.src.rpm
new file mode 100644
index 0000000..bc672d1
--- /dev/null
+++ b/dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.src.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2806f63dbf28baacdb0abae114d91e8ff66db69814d67ea087e09dc1f00d4e1
+size 235627
diff --git a/dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.x86_64.rpm b/dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.x86_64.rpm
new file mode 100644
index 0000000..8a55bc8
--- /dev/null
+++ b/dangerzone/f39/dangerzone-qubes-0.7.1-1.fc39.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1f2a208487892510a41ef7971e4d9f76f9951e6b5f4009dbec7aff6a7e9e3c7
+size 227851
diff --git a/dangerzone/f40/dangerzone-0.7.0-1.fc40.src.rpm b/dangerzone/f40/dangerzone-0.7.0-1.fc40.src.rpm
deleted file mode 100644
index 5469fd5..0000000
--- a/dangerzone/f40/dangerzone-0.7.0-1.fc40.src.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a54e7d9792760ac34972122f37b794f8f67228a432d3b1c6f5ae55cf65d7a983
-size 692588617
diff --git a/dangerzone/f40/dangerzone-0.7.0-1.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-0.7.0-1.fc40.x86_64.rpm
deleted file mode 100644
index 2cf0df2..0000000
--- a/dangerzone/f40/dangerzone-0.7.0-1.fc40.x86_64.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:479fb0211d66d91caba76e88eb6525934e257b474f1826fd8c73bc7587d61d77
-size 689421051
diff --git a/dangerzone/f40/dangerzone-0.7.1-1.fc40.src.rpm b/dangerzone/f40/dangerzone-0.7.1-1.fc40.src.rpm
new file mode 100644
index 0000000..f8eb559
--- /dev/null
+++ b/dangerzone/f40/dangerzone-0.7.1-1.fc40.src.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe39a77409b8fd30fa50c9f7dae904631fcb6acf584a49d2d228eb884d9dfcc5
+size 690441226
diff --git a/dangerzone/f40/dangerzone-0.7.1-1.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-0.7.1-1.fc40.x86_64.rpm
new file mode 100644
index 0000000..46aa405
--- /dev/null
+++ b/dangerzone/f40/dangerzone-0.7.1-1.fc40.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47f689a7f9113c259225acba6067e1d9e6c03eb3bd016caac98676a832a8a5de
+size 687239286
diff --git a/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.src.rpm b/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.src.rpm
deleted file mode 100644
index 9ca9a86..0000000
--- a/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.src.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30807270fdbd5dcd0d78e9cfe05e4291bd62ced804401890488dbae448599265
-size 162551
diff --git a/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.x86_64.rpm
deleted file mode 100644
index ee9f96c..0000000
--- a/dangerzone/f40/dangerzone-qubes-0.7.0-1.fc40.x86_64.rpm
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0752e1efe918c8dec36e6fe727dc2ca19ed53857d8e4245e80b2b07f931e2016
-size 227741
diff --git a/dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.src.rpm b/dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.src.rpm
new file mode 100644
index 0000000..2bb7d88
--- /dev/null
+++ b/dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.src.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bfd8cac44d72ccadb4877277e7b7a2ef8c3ac36280f6ab9ce5f32557b3d21d2f
+size 235474
diff --git a/dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.x86_64.rpm b/dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.x86_64.rpm
new file mode 100644
index 0000000..aa563e9
--- /dev/null
+++ b/dangerzone/f40/dangerzone-qubes-0.7.1-1.fc40.x86_64.rpm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d9bea708edabf0ac268cedb46f7e05d753d1c15d01620a880eb0e0608f3669e
+size 227879

From fb5db1214d8dd265e0d38df7d0d4de0a3da9be5a Mon Sep 17 00:00:00 2001
From: Alexis Metaireau <alexis@freedom.press>
Date: Tue, 1 Oct 2024 03:27:15 -0700
Subject: [PATCH 2/2] Read the dangerzone package version from the .rpm files.

This allows the main branch and yum-tools-prod versions to be different,
which is helpful for instance in the case of hotfix releases.
---
 .github/workflows/check-packages.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/check-packages.yml b/.github/workflows/check-packages.yml
index 0d637b4..0b76351 100644
--- a/.github/workflows/check-packages.yml
+++ b/.github/workflows/check-packages.yml
@@ -41,6 +41,10 @@ jobs:
           path: yum
           lfs: 'true'
 
+      - name: update version from the package
+        run: |
+          echo ./yum/dangerzone/f${{ matrix.version }}/dangerzone-qubes*.src.rpm | sed 's/.*-\([^-]*\)-[^-]*\.*\.src\.rpm/\1/' > ./main/share/version.txt
+
       - name: mv dangerzone .rpm files
         run: |
           mkdir "./main/dist"