rpms/libpq
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the v13 update

Browse Source
This commit is contained in:
Honza Horak 2020-10-30 20:29:26 +01:00
parent 7d81dca0ea
commit 0af3abaff4
2 changed files with 70 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libpq-10.3-var-run-socket.patch
View File

@ -42,12 +42,12 @@ diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index 8f3ec6bde1..066daf3f08 100644 index 8f3ec6bde1..066daf3f08 100644
--- a/src/include/pg_config_manual.h --- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h
@@ -203,7 +203,7 @@ @@ -201,7 +201,7 @@
* support them yet.
*/
#ifndef WIN32 #ifndef WIN32
#define DEFAULT_PGSOCKET_DIR "/tmp" -#define DEFAULT_PGSOCKET_DIR "/tmp"
#else
-#define DEFAULT_PGSOCKET_DIR ""
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql"
#else
#define DEFAULT_PGSOCKET_DIR ""
#endif #endif
/*

77
libpq-12.1-symbol-versioning.patch
View File

@ -1,5 +1,13 @@
commit 75040c3388d9a7dd5ad2bee53cbcc8bf3d35cd17
Author: Honza Horak <hhorak@redhat.com>
Date: Fri Oct 30 20:16:50 2020 +0100
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 diff --git a/config/Makefile b/config/Makefile
index 67e7998f55..86612a42c3 100644 index 67e7998..86612a4 100644
--- a/config/Makefile --- a/config/Makefile
+++ b/config/Makefile +++ b/config/Makefile
@@ -8,6 +8,7 @@ include $(top_builddir)/src/Makefile.global @@ -8,6 +8,7 @@ include $(top_builddir)/src/Makefile.global
@ -10,19 +18,6 @@ index 67e7998f55..86612a42c3 100644
installdirs: installdirs:
$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config' $(MKDIR_P) '$(DESTDIR)$(pgxsdir)/config'
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 29a7f6d38c..d7599a3e16 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -215,7 +215,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/config/build-exports-gnu-ld b/config/build-exports-gnu-ld diff --git a/config/build-exports-gnu-ld b/config/build-exports-gnu-ld
new file mode 100755 new file mode 100755
index 0000000000..84c48e3ade index 0000000000..84c48e3ade
@ -43,35 +38,48 @@ index 0000000000..84c48e3ade
+ +
+open_block () +open_block ()
+{ +{
+ $first || echo + $first || echo
+ first=false + first=false
+ echo "${SYMBOL_VERSION_PREFIX}$version {" + echo "${SYMBOL_VERSION_PREFIX}$version {"
+ echo "global:" + echo "global:"
+} +}
+ +
+close_block () +close_block ()
+{ +{
+ echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};" + echo "}${version_prev:+ $SYMBOL_VERSION_PREFIX$version_prev};"
+ version_prev=$version + version_prev=$version
+ version=$1 + version=$1
+} +}
+ +
+open_block +open_block
+while read -r symbol _ new_version +while read -r symbol _ new_version
+do +do
+ case $symbol in '#'*) continue ;; esac + case $symbol in '#'*) continue ;; esac
+ if test -n "$new_version" && test "$new_version" != "$version"; then + if test -n "$new_version" && test "$new_version" != "$version"; then
+ close_block "$new_version" + close_block "$new_version"
+ open_block + open_block
+ fi + fi
+ echo " $symbol;" + echo " $symbol;"
+done +done
+ +
+echo "local:" +echo "local:"
+echo " *;" +echo " *;"
+close_block +close_block
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 373d73caef..d5bd5468cd 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -231,7 +231,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 diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
index bbc1f90481..0b00a94279 100644 index bbc1f90..fc3ef8a 100644
--- a/src/interfaces/libpq/exports.txt --- a/src/interfaces/libpq/exports.txt
+++ b/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt
@@ -171,11 +171,11 @@ PQsslAttributeNames 168 @@ -171,11 +171,11 @@ PQsslAttributeNames 168
@ -79,13 +87,12 @@ index bbc1f90481..0b00a94279 100644
PQsetErrorContextVisibility 170 PQsetErrorContextVisibility 170
PQresultVerboseErrorMessage 171 PQresultVerboseErrorMessage 171
-PQencryptPasswordConn 172 -PQencryptPasswordConn 172
-PQresultMemorySize 173 +PQencryptPasswordConn 172 10
+PQencryptPasswordConn 172 10 PQresultMemorySize 173
+PQresultMemorySize 173 12
PQhostaddr 174 PQhostaddr 174
PQgssEncInUse 175 PQgssEncInUse 175
-PQgetgssctx 176 PQgetgssctx 176
+PQgetgssctx 176 13 -PQsetSSLKeyPassHook_OpenSSL 177
PQsetSSLKeyPassHook_OpenSSL 177 +PQsetSSLKeyPassHook_OpenSSL 177 13
PQgetSSLKeyPassHook_OpenSSL 178 PQgetSSLKeyPassHook_OpenSSL 178
PQdefaultSSLKeyPassHook_OpenSSL 179 PQdefaultSSLKeyPassHook_OpenSSL 179