diff --git a/community/slony1/APKBUILD b/community/slony1/APKBUILD index bde078df922..37ae9c0d74a 100644 --- a/community/slony1/APKBUILD +++ b/community/slony1/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=slony1 pkgver=2.2.11 -pkgrel=1 +pkgrel=2 pkgdesc="master to multiple slaves replication system for PostgreSQL" options="!check" # Requires running instance of postgresql url="http://slony.info/" @@ -14,6 +14,7 @@ source="http://main.slony.info/downloads/${pkgver%.*}/source/slony1-$pkgver.tar. slony1.initd slony1.confd default-config.patch + gcc14.patch " prepare() { @@ -44,4 +45,5 @@ sha512sums=" 0281cb197db53cf5c3c6aca3bcc1d7010127fe2a7bbb36d48a9c044311d65e0ffaf0f6b83a0100e1ec0f442bc4614b1d6726b8589f779f36d7369594b956b794 slony1.initd 474fe25e49cd88a705911255d127417dabf9ba675aa67faad336dc419f19ea7416d48e84d26b03b63cec74524383b132439640b715c54fbd22389468342f0e4b slony1.confd fa74f013e595faaa801375c41516c23801a4811ac5993a08da1d595550f8fa6fc092c1b7ffd769cd8c9118eb71f3029b0ef1bd24ec502f240512ee97f82ed028 default-config.patch +bf306722cbe3b736d7813cf2ecd9c7ea33bf39a5e01f41d9a4ee69cbfe75c9e981686ed257853c646ea447ae0b036993ae31c68376dfe71ac79a1ad50e375851 gcc14.patch " diff --git a/community/slony1/gcc14.patch b/community/slony1/gcc14.patch new file mode 100644 index 00000000000..d8efa3b7b9f --- /dev/null +++ b/community/slony1/gcc14.patch @@ -0,0 +1,27 @@ +Source: https://sources.debian.org/patches/slony1-2/2.2.11-4/gcc14/ + +Fix -Wint-conversion error with gcc 14. + +``` +In file included from /usr/include/postgresql/16/server/postgres.h:46, + from slony1_funcs.c:13: +slony1_funcs.c: In function 'getClusterStatus': +slony1_funcs.c:2515:100: error: passing argument 1 of 'DatumGetCString' makes integer from pointer without a cast [-Wint-conversion] + 2515 | elog(ERROR, "Slony-I: Node is uninitialized - cluster %s", DatumGetCString(cluster_name)); + | ^~~~~~~~~~~~ + | | + | Name {aka struct nameData *} +``` + +--- +--- a/src/backend/slony1_funcs.c ++++ b/src/backend/slony1_funcs.c +@@ -2512,7 +2512,7 @@ getClusterStatus(Name cluster_name, int + SPI_getbinval(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1, &isnull)); + SPI_freetuptable(SPI_tuptable); + if (cs->localNodeId < 0) +- elog(ERROR, "Slony-I: Node is uninitialized - cluster %s", DatumGetCString(cluster_name)); ++ elog(ERROR, "Slony-I: Node is uninitialized - cluster %s", NameStr(*cluster_name)); + + /* + * Initialize the currentXid to invalid