From 01e6d13adbc9595a4a1b6b7c54bf5b41b69930f4 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:17:04 +0200 Subject: [PATCH 01/51] Build action --- .github/workflows/c-cpp.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/c-cpp.yml diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml new file mode 100644 index 0000000000..e3233268f7 --- /dev/null +++ b/.github/workflows/c-cpp.yml @@ -0,0 +1,23 @@ +name: C/C++ CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: configure + run: ./configure + - name: make + run: make + - name: make check + run: make check + - name: make distcheck + run: make distcheck From c399cdc60cdced2e3026f06fc0038bbc78860c72 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:20:02 +0200 Subject: [PATCH 02/51] ./autogen.sh --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e3233268f7..dc7649a98c 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: configure - run: ./configure + run: ./autogen.sh - name: make run: make - name: make check From 24279419e38d6c9d1cd3a17a2d2f322f5d0b5706 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:26:27 +0200 Subject: [PATCH 03/51] install automake --- .github/workflows/c-cpp.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index dc7649a98c..599d5a6f6b 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: setup + run: apt install automake - name: configure run: ./autogen.sh - name: make From e2e4ab9948299a5b7d65938f08470af35e7079cc Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:28:05 +0200 Subject: [PATCH 04/51] sudo apt --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 599d5a6f6b..f7c3f12f7d 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: apt install automake + run: sudo apt install automake - name: configure run: ./autogen.sh - name: make From 3c632514517df88d4c88c9dec36988bb318e9180 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:29:36 +0200 Subject: [PATCH 05/51] autoconf --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index f7c3f12f7d..dc38bdf32d 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install automake + run: sudo apt install autoconf automake - name: configure run: ./autogen.sh - name: make From 35cd3c4c910d1477ed1f9c34bb0a9d0906ded1e9 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:31:01 +0200 Subject: [PATCH 06/51] autopoint --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index dc38bdf32d..a9df18e93c 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake + run: sudo apt install autoconf automake autopoint - name: configure run: ./autogen.sh - name: make From be5058dd0743f2251b59f4a5e8963dad5fd5e95c Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:34:16 +0200 Subject: [PATCH 07/51] libgcrypt-devel --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index a9df18e93c..7c5222c4f2 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint + run: sudo apt install autoconf automake autopoint libgcrypt-devel - name: configure run: ./autogen.sh - name: make From 6fd4808f602aa7579abd6c62227977a45f13c17d Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:36:57 +0200 Subject: [PATCH 08/51] libgcrypt-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 7c5222c4f2..432d34a381 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-devel + run: sudo apt install autoconf automake autopoint libgcrypt-dev - name: configure run: ./autogen.sh - name: make From 20025bd6fea24003375ef847520bcf3c319e731c Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:39:44 +0200 Subject: [PATCH 09/51] libpopt-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 432d34a381..8a791c2418 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev - name: configure run: ./autogen.sh - name: make From 5dcc1d743ecc258dbf36c5c7fde0bbe24a006ddf Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:41:36 +0200 Subject: [PATCH 10/51] libarchive-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 8a791c2418..37e9dd8696 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev - name: configure run: ./autogen.sh - name: make From 08ba78a54f1b453f22d2f1c71724dd8431af7c35 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:44:11 +0200 Subject: [PATCH 11/51] liblua-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 37e9dd8696..b34a79b6eb 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua-dev - name: configure run: ./autogen.sh - name: make From 9f0c6709d840a23c9dc96819b62842d82ad37268 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:45:29 +0200 Subject: [PATCH 12/51] lua-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index b34a79b6eb..e56d996485 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua-dev - name: configure run: ./autogen.sh - name: make From 70f8a4c4e99bdc937237a627e66e69e68619197f Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:46:30 +0200 Subject: [PATCH 13/51] lua --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e56d996485..0cd761fac8 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua - name: configure run: ./autogen.sh - name: make From b1a27d8f3d4dc24d82504731eb43e72ce9852759 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:48:19 +0200 Subject: [PATCH 14/51] liblua53-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 0cd761fac8..90c140c1ca 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua53-dev - name: configure run: ./autogen.sh - name: make From 361453f6d5f109e823c103c1d613a314bc65edb0 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:49:13 +0200 Subject: [PATCH 15/51] liblua5.3-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 90c140c1ca..38112cdbcb 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua53-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev - name: configure run: ./autogen.sh - name: make From 5c9e97ed8f00b4afa1c908bc40c60bd1af8fbe7f Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Wed, 31 Mar 2021 17:51:10 +0200 Subject: [PATCH 16/51] lua5.3 --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 38112cdbcb..2c346b9ede 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3 - name: configure run: ./autogen.sh - name: make From 6bc33b6e3a13e01116e3129026447edde6b4ebfa Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 21:31:56 +0200 Subject: [PATCH 17/51] sh -x autogen.sh --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 2c346b9ede..83d99de3dc 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -16,7 +16,7 @@ jobs: - name: setup run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3 - name: configure - run: ./autogen.sh + run: sh -x autogen.sh - name: make run: make - name: make check From d1c4f5b3da35b58aafea789481e521650cb8dca3 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 21:37:23 +0200 Subject: [PATCH 18/51] sh -x autogen.sh --rpmconfigure --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 83d99de3dc..2ec7ac159e 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -16,7 +16,7 @@ jobs: - name: setup run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3 - name: configure - run: sh -x autogen.sh + run: sh -x autogen.sh --rpmconfigure - name: make run: make - name: make check From 57b6405d363677bfd1bb23859ba5b399c1e28933 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 21:48:03 +0200 Subject: [PATCH 19/51] || cat configure.log --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 2ec7ac159e..425a0bfbe3 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -16,7 +16,7 @@ jobs: - name: setup run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3 - name: configure - run: sh -x autogen.sh --rpmconfigure + run: sh -x autogen.sh --rpmconfigure || cat configure.log - name: make run: make - name: make check From 8c9afefcc636f8e6ec9322b6f818df5459867207 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 21:51:33 +0200 Subject: [PATCH 20/51] sh -x autogen.sh --noconfigure && sh -x configure --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 425a0bfbe3..4375d489da 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -16,7 +16,7 @@ jobs: - name: setup run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3 - name: configure - run: sh -x autogen.sh --rpmconfigure || cat configure.log + run: sh -x autogen.sh --noconfigure && sh -x configure - name: make run: make - name: make check From 5a8bc8624e8114f139b9b2e6d2f050f76c55624d Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 21:59:16 +0200 Subject: [PATCH 21/51] lua5.3-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 4375d489da..e315c465dd 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3 + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3-dev - name: configure run: sh -x autogen.sh --noconfigure && sh -x configure - name: make From bbc5ae7b0019caed4d9fbba4eaae8531e079d8d0 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 22:00:28 +0200 Subject: [PATCH 22/51] liblua5.3-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e315c465dd..85a01cf1f5 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev lua5.3-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev - name: configure run: sh -x autogen.sh --noconfigure && sh -x configure - name: make From b0f1e7b3e4df9300c314057860b37cdf453e207c Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 22:11:36 +0200 Subject: [PATCH 23/51] /usr/bin/pkg-config 'lua >= 5.2' --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 85a01cf1f5..1c910bef8a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && /usr/bin/pkg-config 'lua >= 5.2' - name: configure run: sh -x autogen.sh --noconfigure && sh -x configure - name: make From 08f0b93a35b0cd12414aa1ed82f99e45aebd2f87 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 22:16:43 +0200 Subject: [PATCH 24/51] dpkg -L liblua5.3-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 1c910bef8a..e12e94875d 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && /usr/bin/pkg-config 'lua >= 5.2' + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && dpkg -L liblua5.3-dev && /usr/bin/pkg-config 'lua >= 5.2' - name: configure run: sh -x autogen.sh --noconfigure && sh -x configure - name: make From 9b8bf39bcebaa8c74fa61fa5d773c4caa5324fbf Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 22:22:11 +0200 Subject: [PATCH 25/51] 'lua53 >= 5.2' --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e12e94875d..4ab0a45959 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && dpkg -L liblua5.3-dev && /usr/bin/pkg-config 'lua >= 5.2' + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && dpkg -L liblua5.3-dev && /usr/bin/pkg-config 'lua53 >= 5.2' - name: configure run: sh -x autogen.sh --noconfigure && sh -x configure - name: make From f4015be6fcd78093b20761fc2f74458e5d3c8ebe Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 22:34:08 +0200 Subject: [PATCH 26/51] lua.pc --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 4ab0a45959..135bb977fa 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && dpkg -L liblua5.3-dev && /usr/bin/pkg-config 'lua53 >= 5.2' + run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure run: sh -x autogen.sh --noconfigure && sh -x configure - name: make From f0361dfb3cf3f4c7f8f132239b299892e399c924 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 22:46:26 +0200 Subject: [PATCH 27/51] make ci --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 135bb977fa..9908ec1ba0 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -16,9 +16,9 @@ jobs: - name: setup run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure - run: sh -x autogen.sh --noconfigure && sh -x configure + run: sh -x autogen.sh --rpmconfigure - name: make - run: make + run: make ci - name: make check run: make check - name: make distcheck From 2a1ecfc162efe609d40dd47d6df13e0053f2196e Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 22:56:44 +0200 Subject: [PATCH 28/51] make ci --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 9908ec1ba0..ce40f2dca0 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -18,7 +18,7 @@ jobs: - name: configure run: sh -x autogen.sh --rpmconfigure - name: make - run: make ci + run: make ci - name: make check run: make check - name: make distcheck From e0682d9a6d6104bf75f3e226777827e7c2c1acea Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 23:14:20 +0200 Subject: [PATCH 29/51] install gettext-dev --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index ce40f2dca0..d3115fd94c 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,11 +14,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' + run: sudo apt install gettext-dev autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure run: sh -x autogen.sh --rpmconfigure - name: make - run: make ci + run: make - name: make check run: make check - name: make distcheck From 5031575c00f5d06533e733307cd31e16ab5ba15b Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 23:15:40 +0200 Subject: [PATCH 30/51] install gettext --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index d3115fd94c..e23bd4e229 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install gettext-dev autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' + run: sudo apt install gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure run: sh -x autogen.sh --rpmconfigure - name: make From 32020574a7d77d4daee85159d64939ad7df3be5a Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 23:41:31 +0200 Subject: [PATCH 31/51] #include --- .github/workflows/c-cpp.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index e23bd4e229..49fbdb9bdb 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -14,7 +14,16 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup - run: sudo apt install gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' + run: | + sudo apt install gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && + sudo patch -d/usr/include <<'*EOF*' && + --- lua.h 2021-04-22 08:50:00.238876965 +0200 + +++ lua.h 2021-04-22 23:29:58.893561189 +0200 + @@ -0,0 +1 @@ + +#include + *EOF* + /usr/bin/pkg-config 'lua >= 5.2' - name: configure run: sh -x autogen.sh --rpmconfigure - name: make From 1fa4215ca30a37aca13175a407148a8418138403 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 23:55:23 +0200 Subject: [PATCH 32/51] AM_CFLAGS += @LUA_CFLAGS@ --- build/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Makefile.am b/build/Makefile.am index fac55735aa..da93915d7c 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/rpm.am AM_CFLAGS = @RPMCFLAGS@ AM_CFLAGS += @OPENMP_CFLAGS@ +AM_CFLAGS += @LUA_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/ AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@ From de079415ab0fb3dd6ec6e418ae7ec2d607ef54d4 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Thu, 22 Apr 2021 23:59:40 +0200 Subject: [PATCH 33/51] install doxygen --- .github/workflows/c-cpp.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 49fbdb9bdb..9640ce616d 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,14 +15,8 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && - sudo patch -d/usr/include <<'*EOF*' && - --- lua.h 2021-04-22 08:50:00.238876965 +0200 - +++ lua.h 2021-04-22 23:29:58.893561189 +0200 - @@ -0,0 +1 @@ - +#include - *EOF* /usr/bin/pkg-config 'lua >= 5.2' - name: configure run: sh -x autogen.sh --rpmconfigure From aef76709b9c795e16503188ee34a1419d3fbb56a Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:03:58 +0200 Subject: [PATCH 34/51] install libzstd-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 9640ce616d..ac9824c82a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From f26e88929f7cf4b2519aeae7547dcfcaec3347ac Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:07:26 +0200 Subject: [PATCH 35/51] install libimaevm-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index ac9824c82a..63eb40d623 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install libimaevm-dev libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From 527525c63b2142b5e53b818a3c421c9d9a561b8c Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:13:59 +0200 Subject: [PATCH 36/51] install ima-evm-utils-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 63eb40d623..c3cab83b04 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install libimaevm-dev libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install ima-evm-utils-dev libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From c021842ec32415c7707ce86f51916a60e3476c98 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:15:48 +0200 Subject: [PATCH 37/51] install ima-evm-dev --- .github/workflows/c-cpp.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index c3cab83b04..502e173069 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,7 +15,8 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install ima-evm-utils-dev libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + apt search ima-evm && + sudo apt install ima-evm-dev libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From 780480776973688c0fabb8d27718c6680d0aea5f Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:17:30 +0200 Subject: [PATCH 38/51] install ima-evm-utils --- .github/workflows/c-cpp.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 502e173069..fd960d0a8a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,8 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - apt search ima-evm && - sudo apt install ima-evm-dev libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From 8343315899537cb12ae413006d523adb0d3fe2d4 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:20:38 +0200 Subject: [PATCH 39/51] install libfsverity-dev --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index fd960d0a8a..9d596565da 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install libfsverity-dev ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From 55f010d756082923fe797d1f6baab4204d5377f5 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:22:09 +0200 Subject: [PATCH 40/51] install fsverity-utils --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 9d596565da..15bb1b6017 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install libfsverity-dev ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install fsverity-utils ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From f6532895f17c5c14094e53cadcaded5a717897a2 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:24:04 +0200 Subject: [PATCH 41/51] install fsverity-dev --- .github/workflows/c-cpp.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 15bb1b6017..ce82f8f7f9 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,7 +15,8 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - sudo apt install fsverity-utils ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + apt search fsverity && + sudo apt install fsverity-dev ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From d099d3d95c12b3dbd143a355e7f9d68127cc4f2b Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:29:11 +0200 Subject: [PATCH 42/51] install fs-verity-utils --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index ce82f8f7f9..7433e2b326 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,8 +15,8 @@ jobs: - uses: actions/checkout@v2 - name: setup run: | - apt search fsverity && - sudo apt install fsverity-dev ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + apt search verity && + sudo apt install fs-verity-utils ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From a176cc0c6e00cbed5ec34690208355e3ac263002 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:42:21 +0200 Subject: [PATCH 43/51] runs-on: ubuntu-20.04 --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 7433e2b326..418218900c 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -9,14 +9,14 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: setup run: | apt search verity && - sudo apt install fs-verity-utils ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install libfsverity-dev ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From 1b0ba880375cde0ed97fa49f31e462b4b7438cec Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:43:39 +0200 Subject: [PATCH 44/51] runs-on: ubuntu-22.04 --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 418218900c..47b02395e3 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 From d36370b6ceff9679125b24fa0d586e3876920c1b Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:44:48 +0200 Subject: [PATCH 45/51] runs-on: ubuntu-21.04 --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 47b02395e3..561e5b5f8a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-21.04 steps: - uses: actions/checkout@v2 From b6c8bf0963215ea5352cad8d865b508ee84f45f5 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Fri, 23 Apr 2021 00:50:29 +0200 Subject: [PATCH 46/51] runs-on: ubuntu-latest --- .github/workflows/c-cpp.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 561e5b5f8a..fd960d0a8a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -9,14 +9,13 @@ on: jobs: build: - runs-on: ubuntu-21.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: setup run: | - apt search verity && - sudo apt install libfsverity-dev ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && + sudo apt install ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev && sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc && /usr/bin/pkg-config 'lua >= 5.2' - name: configure From 7254dcf41aad110884aab9b2499d64da55ed4f7d Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Mon, 26 Apr 2021 14:35:17 +0200 Subject: [PATCH 47/51] make check && rpm/rpm --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index fd960d0a8a..642859fded 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -23,6 +23,6 @@ jobs: - name: make run: make - name: make check - run: make check + run: make check && rpm/rpm - name: make distcheck run: make distcheck From 8b6be478dc3aecc91efe38e1074b4d1b8ec83d25 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Mon, 26 Apr 2021 14:40:01 +0200 Subject: [PATCH 48/51] make check && ./rpm --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 642859fded..9db8ab5ac6 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -23,6 +23,6 @@ jobs: - name: make run: make - name: make check - run: make check && rpm/rpm + run: make check && ./rpm - name: make distcheck run: make distcheck From 76140015f754fe23d3a2a6800fc1064a159acb42 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Mon, 26 Apr 2021 14:45:19 +0200 Subject: [PATCH 49/51] ./rpm 2>/tmp/rpm.txt && grep -F '[-q' /tmp/rpm.txt --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 9db8ab5ac6..46187295b2 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -23,6 +23,6 @@ jobs: - name: make run: make - name: make check - run: make check && ./rpm + run: make check && ./rpm 2>/tmp/rpm.txt && grep -F '[-q' /tmp/rpm.txt - name: make distcheck run: make distcheck From 5ee63943031c58807ce6468b167691005724e6aa Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Mon, 26 Apr 2021 14:54:02 +0200 Subject: [PATCH 50/51] ! ./rpm && grep -F '[-q' --- .github/workflows/c-cpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 46187295b2..fd36909ab6 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -23,6 +23,6 @@ jobs: - name: make run: make - name: make check - run: make check && ./rpm 2>/tmp/rpm.txt && grep -F '[-q' /tmp/rpm.txt + run: make check && ! ./rpm 2>/tmp/rpm.txt && grep -F '[-q' /tmp/rpm.txt - name: make distcheck run: make distcheck From 7671bc5d9e6d6230f58d680d50e52c8b14de2a31 Mon Sep 17 00:00:00 2001 From: Christopher Yeleighton Date: Mon, 26 Apr 2021 15:27:41 +0200 Subject: [PATCH 51/51] move option -q to rpmQueryPoptTable --- lib/poptQV.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/poptQV.c b/lib/poptQV.c index d9d1fad759..fb295de8b8 100644 --- a/lib/poptQV.c +++ b/lib/poptQV.c @@ -91,8 +91,6 @@ struct poptOption rpmQVSourcePoptTable[] = { { "hdrid", '\0', 0, 0, POPT_QUERYBYHDRID, N_("query/verify package(s) with header identifier"), "SHA1" }, - { "query", 'q', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'q', - N_("rpm query mode"), NULL }, { "querybynumber", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_QUERYBYNUMBER, N_("query/verify a header instance"), "HDRNUM" }, { "tid", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_QUERYBYTID, @@ -219,6 +217,8 @@ struct poptOption rpmQVFilePoptTable[] = { struct poptOption rpmQueryPoptTable[] = { { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE, queryArgCallback, 0, NULL, NULL }, + { "query", 'q', 0, 0, 'q', + N_("query information about packages, in particular:"), NULL }, { "dump", '\0', 0, 0, POPT_DUMP, N_("dump basic file information"), NULL }, { NULL, 'i', POPT_ARGFLAG_DOC_HIDDEN, 0, 'i',