diff --git a/testing/postgresql-pgmq/APKBUILD b/testing/postgresql-pgmq/APKBUILD index 3b4d8d4fe75..765f12aa8b6 100644 --- a/testing/postgresql-pgmq/APKBUILD +++ b/testing/postgresql-pgmq/APKBUILD @@ -1,12 +1,11 @@ # Contributor: Jakub Jirutka # Maintainer: Jakub Jirutka pkgname=postgresql-pgmq -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="A lightweight message queue, like AWS SQS and RSMQ, but on PostgreSQL" url="https://github.com/tembo-io/pgmq" -# ppc64le,riscv64,s390x: fails to build due to ring crate (https://github.com/pgcentralfoundation/pgrx/pull/1442) -arch="all !ppc64le !riscv64 !s390x" +arch="all" license="PostgreSQL" makedepends=" cargo @@ -17,7 +16,9 @@ makedepends=" postgresql-dev rustfmt " -source="https://github.com/tembo-io/pgmq/archive/v$pkgver/postgresql-pgmq-$pkgver.tar.gz" +source="https://github.com/tembo-io/pgmq/archive/v$pkgver/postgresql-pgmq-$pkgver.tar.gz + bump-pgrx.patch + " builddir="$srcdir/pgmq-$pkgver" # check: tests tries to write to /usr/lib/... # net: fetches crates in build phase @@ -45,7 +46,7 @@ build() { cargo pgrx init --pg$pgver="$(which pg_config)" - # TODO: Remove after >0.11.2 is released (https://github.com/pgcentralfoundation/pgrx/pull/1441). + # TODO: Remove after https://github.com/pgcentralfoundation/pgrx/issues/1455 is resolved. [ -n "$RUSTFLAGS" ] && export RUSTFLAGS="$(echo $RUSTFLAGS)" || unset RUSTFLAGS cargo pgrx package --verbose --out-dir="target/release/dist" @@ -62,5 +63,6 @@ package() { } sha512sums=" -216f453c10021897fe567b55646e2b7e70b5b36cdb3d2b8d5171db1757e0333f201cb23ff49e7b3a510c61c64d3ac1aaf990c0c23bc6947d3734787357b84ed6 postgresql-pgmq-1.1.0.tar.gz +75e9472f0b5ef3d3b29f0ff04571acae9fa00a1210e49b3cd36710099607f9b4827d34764424f42cbb169351b88bb4d04afba53993e8c8862e83755d1ab1d304 postgresql-pgmq-1.1.1.tar.gz +ce5161c08645cad6f5ef2623786654e7916eb14190b453affeb10c940aff7b98178a1b4d7ac99b2cff22fe589ced108f3261acc0fe8a9da160f18a7128b20775 bump-pgrx.patch " diff --git a/testing/postgresql-pgmq/bump-pgrx.patch b/testing/postgresql-pgmq/bump-pgrx.patch new file mode 100644 index 00000000000..8e8cef3627d --- /dev/null +++ b/testing/postgresql-pgmq/bump-pgrx.patch @@ -0,0 +1,168 @@ +Patch-Source: https://github.com/tembo-io/pgmq/pull/188 +-- +From 0d7197eed345259336ff60fde9006533d8534c65 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Sat, 27 Jan 2024 23:25:26 +0100 +Subject: [PATCH] Bump pgrx from 0.11.0 to 0.11.3 + +--- + Cargo.lock | 62 ++++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 46 insertions(+), 16 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index bc00ead..7839bd4 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -145,9 +145,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + + [[package]] + name = "bindgen" +-version = "0.68.1" ++version = "0.69.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" ++checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d" + dependencies = [ + "bitflags 2.4.0", + "cexpr", +@@ -1354,9 +1354,9 @@ dependencies = [ + + [[package]] + name = "pgrx" +-version = "0.11.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd3c4b36fbe84329b86c83bfd33b9514a50606f00074f47085f99062a7dd8c9c" ++checksum = "2102faa5ef4a7bf096fefcf67692b293583efd18f9236340ad3169807dfc2b73" + dependencies = [ + "atomic-traits", + "bitflags 2.4.0", +@@ -1379,9 +1379,9 @@ dependencies = [ + + [[package]] + name = "pgrx-macros" +-version = "0.11.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c6a41e021321a814fac1aa27bd4266208b4507709ecbc28fc99693adfbd0c41" ++checksum = "c26810d09910ec987a6708d48d243efb5f879331e01c6fec0893714d0eb12bae" + dependencies = [ + "pgrx-sql-entity-graph", + "proc-macro2", +@@ -1391,9 +1391,9 @@ dependencies = [ + + [[package]] + name = "pgrx-pg-config" +-version = "0.11.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17da1e26800e747d501b8d8bb8aeee4530a07d93a39c3fb2c4229a8feff213b2" ++checksum = "0b0099ba4b635dfe1e34afc8bca8be43e9577c5d726aaf1dc7dd23a78f6c8a60" + dependencies = [ + "cargo_toml", + "dirs", +@@ -1409,11 +1409,12 @@ dependencies = [ + + [[package]] + name = "pgrx-pg-sys" +-version = "0.11.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f9032b517525ec71579cc68e92905b5f5f63e892c094834202313c42f2f1a669" ++checksum = "3f40315259c41fede51eb23b791b48d0a112b0f47d0dcb6862b798d1fa1db6ea" + dependencies = [ + "bindgen", ++ "clang-sys", + "eyre", + "libc", + "memoffset", +@@ -1427,13 +1428,14 @@ dependencies = [ + "shlex", + "sptr", + "syn 1.0.109", ++ "walkdir", + ] + + [[package]] + name = "pgrx-sql-entity-graph" +-version = "0.11.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e4a88203974b887bca8bfdea17ab9936411fb7e84957763dc0124df78d07907" ++checksum = "7d47a4e991c8c66162c5d6b0fc2bd382e43a58fc893ce05a6a15ddcb1bf7eee4" + dependencies = [ + "convert_case", + "eyre", +@@ -1446,9 +1448,9 @@ dependencies = [ + + [[package]] + name = "pgrx-tests" +-version = "0.11.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c80deb4310538e6ef14f4cbb30b56eb24b6d7aae66bfd4e516f153987159e65e" ++checksum = "ab3abc01e2bb930b072bd660d04c8eaa69a29d4727d5b2a641f946c603c1605e" + dependencies = [ + "clap-cargo", + "eyre", +@@ -1832,6 +1834,15 @@ version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ + [[package]] + name = "schannel" + version = "0.1.22" +@@ -1980,9 +1991,9 @@ dependencies = [ + + [[package]] + name = "shlex" +-version = "1.2.0" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + + [[package]] + name = "signature" +@@ -2645,6 +2656,16 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "walkdir" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" ++dependencies = [ ++ "same-file", ++ "winapi-util", ++] ++ + [[package]] + name = "wasi" + version = "0.10.0+wasi-snapshot-preview1" +@@ -2747,6 +2768,15 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + ++[[package]] ++name = "winapi-util" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" ++dependencies = [ ++ "winapi", ++] ++ + [[package]] + name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0"