summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/Manifest.gzbin15230 -> 15230 bytes
-rw-r--r--dev-db/citus/Manifest13
-rw-r--r--dev-db/citus/citus-10.2.7.ebuild31
-rw-r--r--dev-db/citus/citus-11.0.6.ebuild35
-rw-r--r--dev-db/citus/citus-11.0.7.ebuild35
-rw-r--r--dev-db/citus/citus-11.1.4.ebuild35
-rw-r--r--dev-db/citus/citus-11.1.5.ebuild6
-rw-r--r--dev-db/citus/citus-11.2.0.ebuild1
-rw-r--r--dev-db/citus/files/citus-11.1.5-redefine.patch79
9 files changed, 88 insertions, 147 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 89a49ac12e21..e1f896898aa2 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
Binary files differ
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index c5388008c04c..acd104885179 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,14 +1,7 @@
+AUX citus-11.1.5-redefine.patch 2590 BLAKE2B cb64affaa0c7ca97afb9960cd5e08028afccac6d5d30e5b596f4867dded04c06e80474414dd6bef6512f52737c69d522278baf4807072bd8243726874e5addfb SHA512 b89539124c025a7e068ba7875452280d7c4ba154b7060d25d23a7f085da0e3402524714f85c3c500a8311f980fc8223df9aa0b845feb2492a17e24a3b07a3c82
AUX citus-11.2.0-redefine.patch 2590 BLAKE2B b1b9a3324db6aec700fc3f40bea7c222742aaad025588383731e211f70d1000d00536f6f92c779f5a80760ee4a384316e95c9ce4b1ca55870c56c1085bb27b56 SHA512 cb813522019da0724338ed1482fa993b4788dca605c92ac4de6d28c12c4379bd0a8f1b9ac786e7facbb7c2399367517634a8ef2f14215ac12ef8561856ccf307
-DIST citus-10.2.7.tar.gz 5549985 BLAKE2B cb562437757624cc34f80219e8039fdcaf27ebc4a63b30714beafe5555a85769f44a92d74173fb94085f48d09bedaffc019463ec6db67217f8554154a91e2e74 SHA512 32441e964d97d3a69eed309c8d52f65ae31a3a7b79c6e765e967025c7f6a041420925dfb5fb0835cec1ae66549f59fe256994f4120514ec2e781169b771c85e6
-DIST citus-11.0.6.tar.gz 6021221 BLAKE2B 7b19328890b79ce639599cf2f99ee15f6dc7e87a062fbd538b288895a3ec6e4af36eabad0a7111de8b53029670be8d6a66ba692a66101c43120640f4fffc37d4 SHA512 4b5667fcfdc89a171ae8e15095d5e688a1d8b4707d13cd4742f5695f9e57e76190e11c4fe933044a64ac00b0982da91d6a253cd272af6ba58131b787ad4b13ef
-DIST citus-11.0.7.tar.gz 6032102 BLAKE2B af36e0f0f3f7f3a3d438f8455caa0531b00b3312b5ec8d85922acdef36a25583b5c5af6054e151ae989122a19d4d78e66a983af41d7a3ac5f781c494fd5247d9 SHA512 3c10a3bd471f82a83f9b3769ac23c107052470d692cc555c2798acfe2afadfc0bcb843db374fe22a0ee41d4f90d1b0f3d2eda6e6e5d9e6e359dd9a9731c26b6b
-DIST citus-11.1.4.tar.gz 6369400 BLAKE2B aca772fbb7fb632c73d92b1f3841e7772d797373891a40c007a147ab9f44ef42eec325553915d7fd11b56f0f60f302b286061ea4ce55351ce9f9d8cd0d9d084b SHA512 f0c4cbbaa0e8ed173d3ba68b24815272ce7c04186bf628c561119833ddd648928ac31adc1784e25f268d45e8d5c02792088f695ad8dbf2ab425093dc1f241f99
DIST citus-11.1.5.tar.gz 6371656 BLAKE2B f370499dc466adb8a9eb45d3b324c50c746ea28966410f62c59beeb246b58d9db9b487bd12e303026fc3480dfd21f4e5b001d19cb587a1ed83ed0f21e8673cc0 SHA512 9cf2c5f43b93e61246e7efec89115d123077cdbcc157da9d83857f2d58b88c83e067a8aa831089ac4f13912a276cfe75e62ca3e10e05a6a300b480bf7a6093ee
DIST citus-11.2.0.tar.gz 6486177 BLAKE2B ca32bcdbf965e357ab1d5efadbf35907b70f2425e4d676ed1963a2e78bcf65f61060995e8e8aafe00cd9e168e46653fa2af3c8bba308574b60065b0d12f25af8 SHA512 c6d6e56d70ceae3cec4a20ea97eb8b62e77f745ee5e3d5a35935165be76888a76ec1dc963c6917b57c424ea6d8aa9c4a5d62c1f61e0b1370de4dbae92f5954f9
-EBUILD citus-10.2.7.ebuild 576 BLAKE2B 2139c10495f8b7c23e0fbc6be85012c24ffce7481f614e2f6134efeab79780b6b8bb7d5f8e7ed1866021fd577dbd8cd8400aa250c37bf568829b55879ef85ddc SHA512 25e3cb723a51b31bf85722098a40e31ecb3f4852dd2806fb91f73d52b2cfeb20159722c3a01d3d17238fb9d9e3ac754def12782c9bd64fe1d0f36f5e94a6ec05
-EBUILD citus-11.0.6.ebuild 643 BLAKE2B 112b8708755f1459308b7b421f5d70562ebbce7e602a4c85a60767bb051e994a72811d127eb9ad6153b574eb5557b0759ae3e7222b9dd3e269eb1eec8ed8cc09 SHA512 de47a96f5146f66e713e9ff18508a2b6f7eb11ff5abb134bd9a2fc8410e321e8afd1e96bcb9fabfa998784e525a8d4df778736e2d27e8029e40bc5f807b68624
-EBUILD citus-11.0.7.ebuild 646 BLAKE2B 3557d4be852f27d0e92ce85ed4175fcd975fa0d8dd58c4dffc3109bee5cfa7086444815530cef1dd86d3eedd84a74d24ed51b3904a93c875d7da36e51629b03d SHA512 aeb8d416efb27eed1bf23e2936a314c3d73fd3702ab7f279cbbdcf8b965ae54d1a7fed2c3ac1e3ed5d7c63c0a9ab6f6297a9a52c4c04f5932f8f4f6b210fc02c
-EBUILD citus-11.1.4.ebuild 646 BLAKE2B 0a53954e30a7a8170971367fc333e92e946be56e247fa6b6bd3301d98cdee73f26347124cb4af8e3ad00b8289c9382a4db8896be77daf7699b923602153ef8de SHA512 529fbf5739ef635b46aca44fe3c48200fc08122ce39ccf0240d91d112806e93df7b3fe756d4d3bd975c1b9fce8655414519e0a3638fb37812393e65545218d98
-EBUILD citus-11.1.5.ebuild 646 BLAKE2B 3557d4be852f27d0e92ce85ed4175fcd975fa0d8dd58c4dffc3109bee5cfa7086444815530cef1dd86d3eedd84a74d24ed51b3904a93c875d7da36e51629b03d SHA512 aeb8d416efb27eed1bf23e2936a314c3d73fd3702ab7f279cbbdcf8b965ae54d1a7fed2c3ac1e3ed5d7c63c0a9ab6f6297a9a52c4c04f5932f8f4f6b210fc02c
-EBUILD citus-11.2.0.ebuild 745 BLAKE2B 6dd3a2c52f60ca01586764bf6dd9b33318b61166f22d149f43615c10bdf04b9fa36d8ffe2b63198a976075e1fa7d853eb2711e10e6f3daa7a2f8630471ceccc5 SHA512 7c79748f92b93851b9f26fc59710fdb8297ee48dda40d2b6a9a872bd2ab9588fa6bc8708ce8cc373c9fa2c55d85b25850ba419324395161c6098825e83fa87fd
+EBUILD citus-11.1.5.ebuild 744 BLAKE2B f8870da34ffcab4e43faf63959272c5b18df06212ba76d1ea226d850db39b18af68f0540535cde9dcc25946f760a2bba2287d7b7d653f754372a416e70cd580b SHA512 bebd754f15128ef115f8be90ff1489a9ccbc0e15f16025fd41d831f9f77ff54d9a9ca3f5b844523f50bf740e590256f18bdb131fbab1139bbf143fee5c23b314
+EBUILD citus-11.2.0.ebuild 744 BLAKE2B 6d1aec893482452602a795f44ba1269e244d707ce3dfcb6d916abb773c573966d9819b029fc4341ea8b865b53b32bfd67399a49d260dd69600673d57cb2b6f39 SHA512 5203e48e91d3afd684d090adb1f598ce966ca9aee85021c027a8689ff8a271ed59b123c374f6c30628706db9709c4f22e54727c1cf5ef9c3c05848e22c14d9ad
MISC metadata.xml 281 BLAKE2B 85a0d31b886497ac44662bb58420de2f6af5444882f008f902287c6a8265f6e76afa7513b0edeca5b34a26d69d9aa61832c5fb3287c577a7f047180aa3fb242e SHA512 9e9007a37a7acc9948a6eb15bd1bdfea46c95eacc88e96a878237baaf01298b1f849d6e170f04638bbfb68f2c8b8a3bf227e563b5309f859cfcd23d43bc5dd85
diff --git a/dev-db/citus/citus-10.2.7.ebuild b/dev-db/citus/citus-10.2.7.ebuild
deleted file mode 100644
index 62d5758baeeb..000000000000
--- a/dev-db/citus/citus-10.2.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 12 13 14 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
- app-arch/lz4
- app-arch/zstd
- "
-RDEPEND="${DEPEND}"
-
-src_configure() {
- postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-11.0.6.ebuild b/dev-db/citus/citus-11.0.6.ebuild
deleted file mode 100644
index a1add589578c..000000000000
--- a/dev-db/citus/citus-11.0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 13 14 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-
-MY_PV="${PV/beta0/beta}"
-SRC_URI="https://github.com/citusdata/citus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
- app-arch/lz4
- app-arch/zstd
- "
-RDEPEND="${DEPEND}"
-
-src_configure() {
- postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-11.0.7.ebuild b/dev-db/citus/citus-11.0.7.ebuild
deleted file mode 100644
index 1b91866bc2b8..000000000000
--- a/dev-db/citus/citus-11.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 13 14 15 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-
-MY_PV="${PV/beta0/beta}"
-SRC_URI="https://github.com/citusdata/citus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
- app-arch/lz4
- app-arch/zstd
- "
-RDEPEND="${DEPEND}"
-
-src_configure() {
- postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-11.1.4.ebuild b/dev-db/citus/citus-11.1.4.ebuild
deleted file mode 100644
index 7282c5e932b4..000000000000
--- a/dev-db/citus/citus-11.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 13 14 15 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-
-MY_PV="${PV/beta0/beta}"
-SRC_URI="https://github.com/citusdata/citus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
- app-arch/lz4
- app-arch/zstd
- "
-RDEPEND="${DEPEND}"
-
-src_configure() {
- postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-11.1.5.ebuild b/dev-db/citus/citus-11.1.5.ebuild
index 1b91866bc2b8..481138f6c14e 100644
--- a/dev-db/citus/citus-11.1.5.ebuild
+++ b/dev-db/citus/citus-11.1.5.ebuild
@@ -30,6 +30,12 @@ DEPEND="${POSTGRES_DEP}
"
RDEPEND="${DEPEND}"
+src_prepare() {
+ eapply "${FILESDIR}"/citus-11.1.5-redefine.patch
+
+ postgres-multi_src_prepare
+}
+
src_configure() {
postgres-multi_foreach econf
}
diff --git a/dev-db/citus/citus-11.2.0.ebuild b/dev-db/citus/citus-11.2.0.ebuild
index 514c4a7fa4d6..7500e4eabad2 100644
--- a/dev-db/citus/citus-11.2.0.ebuild
+++ b/dev-db/citus/citus-11.2.0.ebuild
@@ -36,7 +36,6 @@ src_prepare() {
postgres-multi_src_prepare
}
-
src_configure() {
postgres-multi_foreach econf
}
diff --git a/dev-db/citus/files/citus-11.1.5-redefine.patch b/dev-db/citus/files/citus-11.1.5-redefine.patch
new file mode 100644
index 000000000000..442dbd86f6a8
--- /dev/null
+++ b/dev-db/citus/files/citus-11.1.5-redefine.patch
@@ -0,0 +1,79 @@
+From 0ff23c07da236225ac7c14736af6b43df5fb8ac8 Mon Sep 17 00:00:00 2001
+From: Jelte Fennema <jelte.fennema@microsoft.com>
+Date: Fri, 10 Feb 2023 16:02:03 +0100
+Subject: [PATCH] Support compilation and run tests on latest PG versions
+ (#6711)
+
+Postgres got minor updates this starts using the images with the latest
+version for our tests.
+
+These new Postgres versions caused a compilation issue in PG14 and PG13
+due to some function being backported that we had already backported
+ourselves. Due this backport being a static inline function it doesn't
+matter who provides this and there will be no linkage errors when either
+running old Citus packages on new PG versions or the other way around.
+
+(cherry picked from commit 3200187757600180fa2b90a5fdba13cbf8aee8b6)
+---
+ .circleci/config.yml | 10 +++++-----
+ src/include/pg_version_compat.h | 11 +++++++++++
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/.circleci/config.yml b/.circleci/config.yml
+index 67428095869..d76688ae316 100644
+--- a/.circleci/config.yml
++++ b/.circleci/config.yml
+@@ -6,19 +6,19 @@ orbs:
+ parameters:
+ image_suffix:
+ type: string
+- default: '-v186a1be'
++ default: '-vc4b1573'
+ pg13_version:
+ type: string
+- default: '13.8'
++ default: '13.10'
+ pg14_version:
+ type: string
+- default: '14.5'
++ default: '14.7'
+ pg15_version:
+ type: string
+- default: '15.0'
++ default: '15.2'
+ upgrade_pg_versions:
+ type: string
+- default: '13.8-14.5-15.0'
++ default: '13.10-14.7-15.2'
+ style_checker_tools_version:
+ type: string
+ default: '0.8.18'
+diff --git a/src/include/pg_version_compat.h b/src/include/pg_version_compat.h
+index fcb857c4111..eb81bca43ac 100644
+--- a/src/include/pg_version_compat.h
++++ b/src/include/pg_version_compat.h
+@@ -55,6 +55,14 @@ pg_strtoint64(char *s)
+ }
+
+
++/*
++ * RelationGetSmgr got backported in 13.10 and 14.7 so redefining it for any
++ * version higher causes compilation errors due to redefining of the function.
++ * We want to use it in all versions. So we backport it ourselves in earlier
++ * versions, and rely on the Postgres provided version in the later versions.
++ */
++#if PG_VERSION_NUM >= PG_VERSION_13 && PG_VERSION_NUM < 130010 \
++ || PG_VERSION_NUM >= PG_VERSION_14 && PG_VERSION_NUM < 140007
+ static inline SMgrRelation
+ RelationGetSmgr(Relation rel)
+ {
+@@ -66,6 +74,9 @@ RelationGetSmgr(Relation rel)
+ }
+
+
++#endif
++
++
+ #define CREATE_SEQUENCE_COMMAND \
+ "CREATE SEQUENCE IF NOT EXISTS %s AS %s INCREMENT BY " INT64_FORMAT \
+ " MINVALUE " INT64_FORMAT " MAXVALUE " INT64_FORMAT \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-20 06:05:16 +0000