summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-03-05 08:36:09 -0800
committerKhem Raj <raj.khem@gmail.com>2024-03-05 11:02:05 -0800
commit39b25351230e3b2dea09845de4c4ffbd15a3a457 (patch)
tree61c2fb3f9e12e02d37503828d4e33d239007fde0 /meta-networking
parenta4ee3123dbf759ed466c6e156f2fb575d0d9c484 (diff)
downloadmeta-openembedded-39b25351230e3b2dea09845de4c4ffbd15a3a457.tar.gz
pgpool2: Upgrade to 4.5.1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/pgpool2/pgpool2/0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch33
-rw-r--r--meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb (renamed from meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb)8
2 files changed, 2 insertions, 39 deletions
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 26f8afe4d..000000000
--- 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 @@
1From 5d335b5ddd052f047759cae0e9b94ec49f9f3884 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Mon, 20 Mar 2023 02:03:04 +0000
4Subject: [PATCH] pgpool2: Fix unknown type name 'fd_set' error with musl.
5
6| read.c: In function 'read_until_ready_for_query':
7| read.c:53:24: error: storage size of 'timeoutval' isn't known
8| 53 | struct timeval timeoutval;
9| | ^~~~~~~~~~
10| read.c:54:9: error: unknown type name 'fd_set'
11| 54 | fd_set readmask;
12| | ^~~~~~
13
14Upstream-Status: Inappropriate [embedded specific]
15Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
16---
17 src/tools/pgproto/read.c | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/src/tools/pgproto/read.c b/src/tools/pgproto/read.c
21index c7fb548..4efe641 100644
22--- a/src/tools/pgproto/read.c
23+++ b/src/tools/pgproto/read.c
24@@ -19,6 +19,7 @@
25 #include "../../include/config.h"
26 #include "pgproto/pgproto.h"
27 #include <unistd.h>
28+#include <sys/select.h>
29 #include <stdlib.h>
30 #include <stdio.h>
31 #include <string.h>
32--
332.34.1
diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb
index 5e6e00cae..b127d6962 100644
--- a/meta-networking/recipes-support/pgpool2/pgpool2_4.4.1.bb
+++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb
@@ -1,4 +1,4 @@
1SUMMARY = "a language independent connection pool server for PostgreSQL." 1SUMMARY = "A language independent connection pool server for PostgreSQL."
2 2
3DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \ 3DESCRIPTION = "Pgpool-II is a middleware that works between PostgreSQL \
4 servers and a PostgreSQL database client. It is distributed \ 4 servers and a PostgreSQL database client. It is distributed \
@@ -12,11 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e4b38de086d73e0521de0bbdbaa4a1a9"
12 12
13SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \ 13SRC_URI = "http://www.pgpool.net/mediawiki/images/pgpool-II-${PV}.tar.gz \
14 file://0001-Fix-build-error-when-build-this-file.patch \ 14 file://0001-Fix-build-error-when-build-this-file.patch \
15 file://0001-pgpool2-Fix-unknown-type-name-fd_set-error-with-musl.patch \
16 file://pgpool.sysconfig \ 15 file://pgpool.sysconfig \
17 file://pgpool.service \ 16 file://pgpool.service \
18 " 17 "
19SRC_URI[sha256sum] = "4b379bbba8e178128a1cee4a5bd1ae116dedb3da6121b728c18f0f54c881f328" 18SRC_URI[sha256sum] = "8e14b0558a15dae8767c8e1acee3f2f6c7c08ebfffda66a359367eaaa56c3936"
20 19
21S = "${WORKDIR}/pgpool-II-${PV}" 20S = "${WORKDIR}/pgpool-II-${PV}"
22 21
@@ -34,9 +33,6 @@ PACKAGECONFIG[postgresql] = "--with-pgsql-includedir=${STAGING_INCDIR}/postgresq
34EXTRA_OECONF += "--disable-static \ 33EXTRA_OECONF += "--disable-static \
35 --disable-rpath \ 34 --disable-rpath \
36 " 35 "
37
38CFLAGS:append = " -fcommon "
39
40FILES:${PN} += "${datadir}/pgpool-II/ " 36FILES:${PN} += "${datadir}/pgpool-II/ "
41 37
42do_configure:append() { 38do_configure:append() {