gentoo auto-resync : 24:11:2023 - 22:37:36

4 files changed, 0 insertions, 160 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 070cbf80b137..f8403b4c00e5 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index 185cd039c23b..8ab16cc31ded 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,5 +1,3 @@
-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-11.3.0.tar.gz 6627414 BLAKE2B 763ebe9cc7c36222b6e1148b18fcf98af3dc4dbc77a141c355f72e3f943b0cd6ba79aa98622e365f81ca1f5965095e75a0e83277a4690fb386b371d5e80dc778 SHA512 4e40240f8e3867823724feda480fe23ee41347b8d49802b3afcedf970f571a97c8d5cf1639d2d776035d125193ca8ff998927aed47c03e1c1ab3bb79da830ee9
 DIST citus-12.0.0.tar.gz 6744359 BLAKE2B 0cd25e60fb4c94a44c1bf8d0db4a4a62a34082285afe4c32700f182a3b9a67c45f68d1629e6bf7659ed1a5884f2da28a638aa0cb97cc870f8832cf9c3c0e7121 SHA512 1e9b985719d1a2c6c1c965cc5708ffc358b62413fafc7f3f9496727763df2e8674782fc2016d452974530c568e7c5ec5a15cb8905ec9ee7344d82b950780f5b8
 DIST citus-12.1.1.tar.gz 6896428 BLAKE2B 2a7abbdb3d4bb7c3f6c1f03992b078dee98ce2eab7401fee07fe7a5d52c8617e46bb53e5a7d4e677de7d9ad825558735fb214f3861c08a9d60c6ede6b0e848c1 SHA512 55dcb41472e855a8ad46ce4305d53e0e9c2658a5111f5ac503aa7f9f6c492be532c9b1222d62e106ee590adc3dedc7b9ae207f6fcd661f740123264ec2524da7
diff --git a/dev-db/citus/files/citus-11.1.5-redefine.patch b/dev-db/citus/files/citus-11.1.5-redefine.patch
deleted file mode 100644
index 442dbd86f6a8..000000000000
--- a/dev-db/citus/files/citus-11.1.5-redefine.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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 \
diff --git a/dev-db/citus/files/citus-11.2.0-redefine.patch b/dev-db/citus/files/citus-11.2.0-redefine.patch
deleted file mode 100644
index d45fba3d65a1..000000000000
--- a/dev-db/citus/files/citus-11.2.0-redefine.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 341fdb32fc07a3aea2dda2fa33a70d22819be37b 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 4905dfbc52c..3a5c30132f6 100644
---- a/.circleci/config.yml
-+++ b/.circleci/config.yml
-@@ -6,19 +6,19 @@ orbs:
- parameters:
-   image_suffix:
-     type: string
--    default: '-v7e4468f'
-+    default: '-vc4b1573'
-   pg13_version:
-     type: string
--    default: '13.9'
-+    default: '13.10'
-   pg14_version:
-     type: string
--    default: '14.6'
-+    default: '14.7'
-   pg15_version:
-     type: string
--    default: '15.1'
-+    default: '15.2'
-   upgrade_pg_versions:
-     type: string
--    default: '13.9-14.6-15.1'
-+    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 \