From 450925b5c0e7907d2b83fb1f19401a0ba2d858e7 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 19 Nov 2021 15:32:20 +0300 Subject: Upgrade to 14.1 --- libpq/.gitignore | 5 +++++ libpq/build/bootstrap.build | 2 +- libpq/libpq/.gitattributes | 1 + libpq/libpq/include/.gitattributes | 1 + libpq/libpq/include/port/.gitattributes | 2 ++ libpq/libpq/pg_config.h | 1 + libpq/manifest | 5 +++-- upstream | 2 +- 8 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 libpq/libpq/.gitattributes create mode 100644 libpq/libpq/include/.gitattributes create mode 100644 libpq/libpq/include/port/.gitattributes diff --git a/libpq/.gitignore b/libpq/.gitignore index 4c4fec7..3dcc22f 100644 --- a/libpq/.gitignore +++ b/libpq/.gitignore @@ -3,9 +3,14 @@ *.d *.t *.i +*.i.* *.ii +*.ii.* *.o *.obj +*.gcm +*.pcm +*.ifc *.so *.so.* *.dll diff --git a/libpq/build/bootstrap.build b/libpq/build/bootstrap.build index e0ef8e9..4219553 100644 --- a/libpq/build/bootstrap.build +++ b/libpq/build/bootstrap.build @@ -30,7 +30,7 @@ using install # been for the several last major version releases). And so_minor is equal to # the package major version. # -if ($version.major == 14 && $version.minor == 0) +if ($version.major == 14 && $version.minor == 1) { abi_major = 5 abi_minor = 14 diff --git a/libpq/libpq/.gitattributes b/libpq/libpq/.gitattributes new file mode 100644 index 0000000..05ef788 --- /dev/null +++ b/libpq/libpq/.gitattributes @@ -0,0 +1 @@ +pq symlink=dir diff --git a/libpq/libpq/include/.gitattributes b/libpq/libpq/include/.gitattributes new file mode 100644 index 0000000..8cb5c4f --- /dev/null +++ b/libpq/libpq/include/.gitattributes @@ -0,0 +1 @@ +common symlink=dir diff --git a/libpq/libpq/include/port/.gitattributes b/libpq/libpq/include/port/.gitattributes new file mode 100644 index 0000000..2ba6a7e --- /dev/null +++ b/libpq/libpq/include/port/.gitattributes @@ -0,0 +1,2 @@ +win32 symlink=dir +win32_msvc symlink=dir diff --git a/libpq/libpq/pg_config.h b/libpq/libpq/pg_config.h index c524ca9..c834880 100644 --- a/libpq/libpq/pg_config.h +++ b/libpq/libpq/pg_config.h @@ -153,6 +153,7 @@ # define HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1 # define HAVE_SYS_UCRED_H 1 # define HAVE_UNION_SEMUN 1 +# define HAVE_MEMSET_S 1 #else # define HAVE_DECL_STRLCAT 0 # define HAVE_DECL_STRLCPY 0 diff --git a/libpq/manifest b/libpq/manifest index f69b0e7..d76b095 100644 --- a/libpq/manifest +++ b/libpq/manifest @@ -3,10 +3,11 @@ name: libpq # Note: remember to update doc-url below! # -version: 14.0.0+1 -upstream-version: 14.0 +version: 14.1.0-a.0.z +upstream-version: 14.1 project: postgresql +priority: security summary: PostgreSQL C API client library license: PostgreSQL ; Permissive free software license. topics: C, PostgreSQL, SQL, relational database diff --git a/upstream b/upstream index 86a4dc1..0a455b8 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 86a4dc1e6f29d1992a2afa3fac1a0b0a6e84568c +Subproject commit 0a455b8d61d8fc5a7d1fdc152667f9ba1fd27fda -- cgit v1.1