diff --git a/libpq-10.3-rpm-pgsql.patch b/libpq-10.3-rpm-pgsql.patch
deleted file mode 100644
index aec64ac7aec751cdf589749c90d626ca5ce27c28..0000000000000000000000000000000000000000
--- a/libpq-10.3-rpm-pgsql.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-For the RPMs, we want the custom installation directories to end in
-/pgsql not /postgresql.  This is historical but not worth changing.
-
-Notice that this patch also makes the appending of /pgsql unconditional.
-This is to avoid unexpected behavior if the RPM is built in a working
-directory whose path happens to include "postgres" or "pgsql" already.
-However, datadir and sysconfdir are already set up in the specfile's
-configure call, so we do not have to append anything to them.
-
-
-diff -Naur postgresql-9.0.1.orig/src/Makefile.global.in postgresql-9.0.1/src/Makefile.global.in
---- postgresql-9.0.1.orig/src/Makefile.global.in	2010-10-01 10:25:44.000000000 -0400
-+++ postgresql-9.0.1/src/Makefile.global.in	2010-10-11 11:52:05.224975308 -0400
-@@ -55,8 +55,7 @@
- # Installation directories
- #
- # These are set by the equivalent --xxxdir configure options.  We
--# append "postgresql" to some of them, if the string does not already
--# contain "pgsql" or "postgres", in order to avoid directory clutter.
-+# append "pgsql" to some of them, in order to avoid directory clutter.
- #
- # In a PGXS build, we cannot use the values inserted into Makefile.global
- # by configure, since the installation tree may have been relocated.
-@@ -74,45 +73,23 @@
- bindir := @bindir@
- 
- datadir := @datadir@
--ifeq "$(findstring pgsql, $(datadir))" ""
--ifeq "$(findstring postgres, $(datadir))" ""
--override datadir := $(datadir)/postgresql
--endif
--endif
- 
- sysconfdir := @sysconfdir@
--ifeq "$(findstring pgsql, $(sysconfdir))" ""
--ifeq "$(findstring postgres, $(sysconfdir))" ""
--override sysconfdir := $(sysconfdir)/postgresql
--endif
--endif
- 
- libdir := @libdir@
- 
- pkglibdir = $(libdir)
--ifeq "$(findstring pgsql, $(pkglibdir))" ""
--ifeq "$(findstring postgres, $(pkglibdir))" ""
--override pkglibdir := $(pkglibdir)/postgresql
--endif
--endif
-+override pkglibdir := $(pkglibdir)/pgsql
- 
- includedir := @includedir@
- 
- pkgincludedir = $(includedir)
--ifeq "$(findstring pgsql, $(pkgincludedir))" ""
--ifeq "$(findstring postgres, $(pkgincludedir))" ""
--override pkgincludedir := $(pkgincludedir)/postgresql
--endif
--endif
-+override pkgincludedir := $(pkgincludedir)/pgsql
- 
- mandir := @mandir@
- 
- docdir := @docdir@
--ifeq "$(findstring pgsql, $(docdir))" ""
--ifeq "$(findstring postgres, $(docdir))" ""
--override docdir := $(docdir)/postgresql
--endif
--endif
-+override docdir := $(docdir)/pgsql
- 
- htmldir := @htmldir@
- 
diff --git a/libpq-10.3-var-run-socket.patch b/libpq-10.3-var-run-socket.patch
deleted file mode 100644
index 8e3b19304cbf5e1ee243ad98c3285158298151f5..0000000000000000000000000000000000000000
--- a/libpq-10.3-var-run-socket.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Change the built-in default socket directory to be /var/run/postgresql.
-For backwards compatibility with (probably non-libpq-based) clients that
-might still expect to find the socket in /tmp, also create a socket in
-/tmp.  This is to resolve communication problems with clients operating
-under systemd's PrivateTmp environment, which won't be using the same
-global /tmp directory as the server; see bug #825448.
-
-Note that we apply the socket directory change at the level of the
-hard-wired defaults in the C code, not by just twiddling the setting in
-postgresql.conf.sample; this is so that the change will take effect on
-server package update, without requiring any existing postgresql.conf
-to be updated.  (Of course, a user who dislikes this behavior can still
-override it via postgresql.conf.)
-
-diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
-index 9481f2d..75532c7 100644
---- a/src/backend/utils/misc/guc.c
-+++ b/src/backend/utils/misc/guc.c
-@@ -3196,7 +3196,7 @@ static struct config_string ConfigureNamesString[] =
- 		},
- 		&Unix_socket_directories,
- #ifdef HAVE_UNIX_SOCKETS
--		DEFAULT_PGSOCKET_DIR,
-+		DEFAULT_PGSOCKET_DIR ", /tmp",
- #else
- 		"",
- #endif
-diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
-index feeff9e..3e3d784 100644
---- a/src/bin/initdb/initdb.c
-+++ b/src/bin/initdb/initdb.c
-@@ -1234,7 +1234,7 @@ setup_config(void)
- 
- #ifdef HAVE_UNIX_SOCKETS
- 	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
--			 DEFAULT_PGSOCKET_DIR);
-+			 DEFAULT_PGSOCKET_DIR ", /tmp");
- #else
- 	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
- #endif
-diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
-index e278fa0..9ee15d4 100644
---- a/src/include/pg_config_manual.h
-+++ b/src/include/pg_config_manual.h
-@@ -169,7 +169,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
- 
- /*
-  * This is the default event source for Windows event log.
diff --git a/libpq-10.4-symbol-versioning.patch b/libpq-10.4-symbol-versioning.patch
deleted file mode 100644
index ad09569a3dfeefb0d4575cf5b65b2d718ec962af..0000000000000000000000000000000000000000
--- a/libpq-10.4-symbol-versioning.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-The libpq package is supposed to be used for all the PostgreSQL modules
-available in RHEL 8, and ABI versioning will guarantee us that modular RPMs will
-depend on appropriate libpq ABI version (picked at build-time).
-
-diff --git a/config/Makefile b/config/Makefile
-index 67e7998f55..86612a42c3 100644
---- a/config/Makefile
-+++ b/config/Makefile
-@@ -8,6 +8,7 @@ include $(top_builddir)/src/Makefile.global
- install: all installdirs
- 	$(INSTALL_SCRIPT) $(srcdir)/install-sh '$(DESTDIR)$(pgxsdir)/config/install-sh'
- 	$(INSTALL_SCRIPT) $(srcdir)/missing '$(DESTDIR)$(pgxsdir)/config/missing'
-+	$(INSTALL_SCRIPT) $(srcdir)/build-exports-gnu-ld '$(DESTDIR)$(pgxsdir)/config/build-exports-gnu-ld'
- 
- installdirs:
- 	$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config'
-diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld
-new file mode 100755
-index 0000000000..bdcfb40d48
---- /dev/null
-+++ b/config/build-exports-gnu-ld
-@@ -0,0 +1,41 @@
-+#! /bin/sh
-+
-+# by default use PG_ prefix
-+: "${SYMBOL_VERSION_PREFIX=PG_}"
-+
-+# we started symbol versioning since v10
-+: "${SYMBOL_VERSION_START=9.6}"
-+
-+version=$SYMBOL_VERSION_START
-+version_prev=
-+first=:
-+
-+open_block ()
-+{
-+	$first || echo
-+	first=false
-+	echo "${SYMBOL_VERSION_PREFIX}$version {"
-+	echo "global:"
-+}
-+
-+close_block ()
-+{
-+	echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};"
-+	version_prev=$version
-+	version=$1
-+}
-+
-+open_block
-+while read -r symbol _ new_version
-+do
-+	case $symbol in '#'*) continue ;; esac
-+	if test -n "$new_version" && test "$new_version" != "$version"; then
-+		close_block "$new_version"
-+		open_block
-+	fi
-+	echo "	$symbol;"
-+done
-+
-+echo "local:"
-+echo "	*;"
-+close_block
-diff --git a/src/Makefile.shlib b/src/Makefile.shlib
-index 95b82a6dea..a7065d02a4 100644
---- a/src/Makefile.shlib
-+++ b/src/Makefile.shlib
-@@ -221,7 +221,7 @@ ifeq ($(PORTNAME), linux)
-   ifdef soname
-     LINK.shared		+= -Wl,-soname,$(soname)
-   endif
--  BUILD.exports		= ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
-+  BUILD.exports		= $(SHELL) $(top_srcdir)/config/build-exports-gnu-ld < $< > $@
-   exports_file		= $(SHLIB_EXPORTS:%.txt=%.list)
-   ifneq (,$(exports_file))
-     LINK.shared		+= -Wl,--version-script=$(exports_file)
-diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
-index d6a38d0df8..29bebeac7e 100644
---- a/src/interfaces/libpq/exports.txt
-+++ b/src/interfaces/libpq/exports.txt
-@@ -171,4 +171,4 @@ PQsslAttributeNames       168
- PQsslAttribute            169
- PQsetErrorContextVisibility 170
- PQresultVerboseErrorMessage 171
--PQencryptPasswordConn     172
-+PQencryptPasswordConn     172     10
--- 
-2.17.0
-
diff --git a/libpq.spec b/libpq.spec
index ed28ce576079a03aab8958f684b196b0e4773cf2..391d483622489eb3b0369048a261619ee82a1b47 100644
--- a/libpq.spec
+++ b/libpq.spec
@@ -1,13 +1,10 @@
 Name: libpq
-Version: 11.2
-Release: 5
+Version: 11.21
+Release: 1
 Summary: A share library of PostgreSQL
 License: PostgreSQL
 Url: http://www.postgresql.org/
-Source0: https://ftp.postgresql.org/pub/source/v11.2/postgresql-11.2.tar.bz2
-Patch0001: libpq-10.3-rpm-pgsql.patch
-Patch0002: libpq-10.3-var-run-socket.patch
-Patch0003: libpq-10.4-symbol-versioning.patch
+Source0: https://ftp.postgresql.org/pub/source/v11.21/postgresql-11.21.tar.bz2
 BuildRequires: gcc glibc-devel bison flex gawk zlib-devel openssl-devel
 BuildRequires: krb5-devel openldap-devel gettext multilib-rpm-config
 Obsoletes: postgresql-libs < 11
@@ -46,7 +43,6 @@ for subdir in %build_subdirs; do
     %make_install -C "$subdir"
 done
 find $RPM_BUILD_ROOT -name '*.a' -delete
-rm -r $RPM_BUILD_ROOT%_includedir/pgsql/server
 %multilib_fix_c_header --file "%_includedir/pg_config.h"
 %multilib_fix_c_header --file "%_includedir/pg_config_ext.h"
 
@@ -70,6 +66,9 @@ cat pg_config-11.lang >>libpq-devel.lst
 %_libdir/pkgconfig/libpq.pc
 
 %changelog
+* Wed Aug 30 2023 ZhenyuZheng <zhengzhenyu@openeuler.sh> - 11.21-1
+- Bump to 11.21 for CVE-2023-39417
+
 * Wed Sep 2 2020 chengzihan <chengzihan2@huawei.com> - 11.2-5
 - Change actually numbers of version and release to macros
 
diff --git a/postgresql-11.2.tar.bz2 b/postgresql-11.21.tar.bz2
similarity index 66%
rename from postgresql-11.2.tar.bz2
rename to postgresql-11.21.tar.bz2
index ef77fcffec7780769136b6890dc64c585e831941..ce1a83bb46bab16b76573840cb3be0df3288eeaa 100644
Binary files a/postgresql-11.2.tar.bz2 and b/postgresql-11.21.tar.bz2 differ