From 39b25351230e3b2dea09845de4c4ffbd15a3a457 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Mar 2024 08:36:09 -0800 Subject: pgpool2: Upgrade to 4.5.1 Signed-off-by: Khem Raj --- ...-unknown-type-name-fd_set-error-with-musl.patch | 33 -------------- .../recipes-support/pgpool2/pgpool2_4.4.1.bb | 53 ---------------------- .../recipes-support/pgpool2/pgpool2_4.5.1.bb | 49 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 86 deletions(-) delete mode 100644 meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch delete mode 100644 meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb create mode 100644 meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch b/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch deleted file mode 100644 index 26f8afe4d6..0000000000 --- a/meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5d335b5ddd052f047759cae0e9b94ec49f9f3884 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Mon, 20 Mar 2023 02:03:04 +0000 -Subject: [PATCH] pgpool2: Fix unknown type name 'fd_set' error with musl. - -| read.c: In function 'read_until_ready_for_query': -| read.c:53:24: error: storage size of 'timeoutval' isn't known -| 53 | struct timeval timeoutval; -| | ^~~~~~~~~~ -| read.c:54:9: error: unknown type name 'fd_set' -| 54 | fd_set readmask; -| | ^~~~~~ - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Lei Maohui ---- - src/tools/pgproto/read.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/tools/pgproto/read.c b/src/tools/pgproto/read.c -index c7fb548..4efe641 100644 ---- a/src/tools/pgproto/read.c -+++ b/src/tools/pgproto/read.c -@@ -19,6 +19,7 @@ - #include "../../include/config.h" - #include "pgproto/pgproto.h" - #include -+#include - #include - #include - #include --- -2.34.1 diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb deleted file mode 100644 index 5e6e00caeb..0000000000 --- a/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "a language independent connection pool server for PostgreSQL." - -DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ - servers and a PostgreSQL database client. It is distributed \ - under a license similar to BSD and MIT. It provides the \ - following features." - -HOMEPAGE = "http://pgpool.net" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" - -SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ - file://0001-Fix-build-error-when-build-this-file.patch \ - file://0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch \ - file://pgpool.sysconfig \ - file://pgpool.service \ - " -SRC_URI[sha256sum] = "4b379bbba8e178128a1cee4a5bd1ae116dedb3da6121b728c18f0f54c881f328" - -S = "${WORKDIR}/pgpool-II-${PV}" - -inherit autotools-brokensep systemd - -SYSTEMD_SERVICE:${PN} = "pgpool.service" - -PACKAGECONFIG ??= " openssl libmemcached postgresql \ -" -PACKAGECONFIG[pam] = "--with-pam,,libpam" -PACKAGECONFIG[openssl] = "--with-openssl,,openssl" -PACKAGECONFIG[libmemcached] = "--with-memcached=${STAGING_INCDIR}/libmemcachedutil-1.0,,libmemcached" -PACKAGECONFIG[postgresql] = "--with-pgsql-includedir=${STAGING_INCDIR}/postgresql,, postgresql" - -EXTRA_OECONF += "--disable-static \ - --disable-rpath \ - " - -CFLAGS:append = " -fcommon " - -FILES:${PN} += "${datadir}/pgpool-II/ " - -do_configure:append() { - echo "#define HAVE_STRCHRNUL 1" >> ${S}/src/include/config.h - sed -i "s,#define USE_REPL_SNPRINTF 1,/* #undef USE_REPL_SNPRINTF*/,g" ${S}/src/include/config.h -} - -do_install:append() { - install -d ${D}${sysconfdir}/pgpool-II - install -D -m 0644 ${WORKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf - install -D -m 0644 ${S}/src/sample/pcp.conf.sample ${D}${sysconfdir}/pgpool-II/pcp.conf - install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf - install -Dm 0644 ${WORKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service -} diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb new file mode 100644 index 0000000000..b127d69625 --- /dev/null +++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb @@ -0,0 +1,49 @@ +SUMMARY = "A language independent connection pool server for PostgreSQL." + +DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ + servers and a PostgreSQL database client. It is distributed \ + under a license similar to BSD and MIT. It provides the \ + following features." + +HOMEPAGE = "http://pgpool.net" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9" + +SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ + file://0001-Fix-build-error-when-build-this-file.patch \ + file://pgpool.sysconfig \ + file://pgpool.service \ + " +SRC_URI[sha256sum] = "8e14b0558a15dae8767c8e1acee3f2f6c7c08ebfffda66a359367eaaa56c3936" + +S = "${WORKDIR}/pgpool-II-${PV}" + +inherit autotools-brokensep systemd + +SYSTEMD_SERVICE:${PN} = "pgpool.service" + +PACKAGECONFIG ??= " openssl libmemcached postgresql \ +" +PACKAGECONFIG[pam] = "--with-pam,,libpam" +PACKAGECONFIG[openssl] = "--with-openssl,,openssl" +PACKAGECONFIG[libmemcached] = "--with-memcached=${STAGING_INCDIR}/libmemcachedutil-1.0,,libmemcached" +PACKAGECONFIG[postgresql] = "--with-pgsql-includedir=${STAGING_INCDIR}/postgresql,, postgresql" + +EXTRA_OECONF += "--disable-static \ + --disable-rpath \ + " +FILES:${PN} += "${datadir}/pgpool-II/ " + +do_configure:append() { + echo "#define HAVE_STRCHRNUL 1" >> ${S}/src/include/config.h + sed -i "s,#define USE_REPL_SNPRINTF 1,/* #undef USE_REPL_SNPRINTF*/,g" ${S}/src/include/config.h +} + +do_install:append() { + install -d ${D}${sysconfdir}/pgpool-II + install -D -m 0644 ${WORKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf + install -D -m 0644 ${S}/src/sample/pcp.conf.sample ${D}${sysconfdir}/pgpool-II/pcp.conf + install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf + install -Dm 0644 ${WORKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service +} -- cgit v1.2.3-54-g00ecf