From 9864ef74b142a0ad92eff84d817262d569211f98 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 14 Feb 2020 23:04:14 +0300 Subject: Release version 12.1.0+2 Drop copyright notice from source code Use adhoc value for libpqdll.map prerequisite-specific variable include Minor cleanups --- libpq/README-DEV | 4 ++-- libpq/build/bootstrap.build | 3 +-- libpq/build/export.build | 1 - libpq/build/root.build | 1 - libpq/buildfile | 3 +-- libpq/libpq/buildfile | 12 ++++++------ libpq/libpq/pg_config.h | 8 ++++++-- libpq/libpq/pg_config_ext.h | 1 - libpq/libpq/pg_config_os.h | 1 - libpq/libpq/pg_config_paths.h | 1 - libpq/libpq/version.h.in | 1 - libpq/manifest | 2 +- libpq/tests/build/bootstrap.build | 1 - libpq/tests/build/root.build | 1 - libpq/tests/buildfile | 1 - libpq/tests/conninfo/buildfile | 1 - libpq/tests/conninfo/driver.c | 1 - libpq/tests/conninfo/postgres_fe.h | 1 - libpq/tests/conninfo/testscript | 1 - 19 files changed, 17 insertions(+), 28 deletions(-) diff --git a/libpq/README-DEV b/libpq/README-DEV index cadfe63..5d7f717 100644 --- a/libpq/README-DEV +++ b/libpq/README-DEV @@ -59,7 +59,7 @@ the newly introduced macros, comparing the already defined and currently used macro sets: $ for m in `cat libpq/pg_config.h.in.orig libpq/pg_config.h.win32.orig | \ - sed -n 's/.*#\s*\(define\|undef\)\s\{1,\}\([_A-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\2/p' | \ + sed -n 's/^.*#\s*\(define\|undef\)\s\{1,\}\([_A-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\2/p' | \ sort -u`; do if grep -q -e "\b$m\b" `find -L . -name '*.h' -a ! -name 'pg_config.h' -o -name '*.c'`; then echo "$m" @@ -67,7 +67,7 @@ $ for m in `cat libpq/pg_config.h.in.orig libpq/pg_config.h.win32.orig | \ done >used-macros $ cat libpq/pg_config.h | \ - sed -n 's/#\s*\(define\|undef\)\s\{1,\}\([_A-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\2/p' | \ + sed -n 's/^#\s*\(define\|undef\)\s\{1,\}\([_A-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\2/p' | \ sort -u >defined-macros $ diff defined-macros used-macros diff --git a/libpq/build/bootstrap.build b/libpq/build/bootstrap.build index 22b180f..378e284 100644 --- a/libpq/build/bootstrap.build +++ b/libpq/build/bootstrap.build @@ -1,5 +1,4 @@ # file : build/bootstrap.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file project = libpq @@ -26,7 +25,7 @@ using install # src/interfaces/libpq/Makefile. # # The library naming schema on Linux is libpq.so.. -# (SO_MAJOR_VERSION and SO_MINOR_VERSION in the Makefile) So presumably +# (SO_MAJOR_VERSION and SO_MINOR_VERSION in the Makefile). So presumably # so_major is incremented on backwards-incompatible ABI changes (it hasn't # been for the several last major version releases). And so_minor is equal to # the package major version. diff --git a/libpq/build/export.build b/libpq/build/export.build index 748c3ea..bb54707 100644 --- a/libpq/build/export.build +++ b/libpq/build/export.build @@ -1,5 +1,4 @@ # file : build/export.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file $out_root/ diff --git a/libpq/build/root.build b/libpq/build/root.build index 76b1aa3..4d6b82e 100644 --- a/libpq/build/root.build +++ b/libpq/build/root.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file # We rely on this in macros/options deduction (see diff --git a/libpq/buildfile b/libpq/buildfile index e2ceea2..a013a31 100644 --- a/libpq/buildfile +++ b/libpq/buildfile @@ -1,6 +1,5 @@ # file : buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd -# license : PostgreSQL Licenes; see accompanying COPYRIGHT file +# license : PostgreSQL Licene; see accompanying COPYRIGHT file ./: {*/ -build/} doc{COPYRIGHT INSTALL README} manifest diff --git a/libpq/libpq/buildfile b/libpq/libpq/buildfile index d77ccf7..bf7f844 100644 --- a/libpq/libpq/buildfile +++ b/libpq/libpq/buildfile @@ -1,6 +1,5 @@ # file : libpq/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd -# license : PostgreSQL Licenes; see accompanying COPYRIGHT file +# license : PostgreSQL Licene; see accompanying COPYRIGHT file import imp_libs = libssl%lib{ssl} import imp_libs += libcrypto%lib{crypto} @@ -19,18 +18,19 @@ lib{pq}: {h }{* -version} \ common/{ c}{* } \ include/{h }{** } \ {def }{libpqdll } \ - {file}{libpqdll.map } \ pq/{file}{pg_service.conf.sample } \ $imp_libs tclass = $c.target.class tsys = $c.target.system +linux = ($tclass == 'linux') bsd = ($tclass == 'bsd') macos = ($tclass == 'macos') windows = ($tclass == 'windows') -lib{pq}: port/c{strlcpy}: include = (!$bsd && !$macos) +lib{pq}: file{libpqdll.map}: include = ($linux || $bsd ? adhoc : false) +lib{pq}: port/c{strlcpy}: include = (!$bsd && !$macos) lib{pq}: pq/{h c}{*win32* } \ port/{h c}{*win32* +getaddrinfo +inet_aton}: include = $windows @@ -49,8 +49,8 @@ h{version}: in{version} $src_root/manifest c.poptions += -DFRONTEND -DUNSAFE_STAT_OK -DSO_MAJOR_VERSION=$abi_major if! $windows - # Note that the upstream package uses -pthread compiler/linker option. It is - # currently unsupported by build2, so we use -D_REENTRANT and -lpthread + # Note that the upstream package uses the -pthread compiler/linker option. + # The option is unsupported by build2 so we pass -D_REENTRANT and -lpthread # preprocessor/linker options instead. We also omit -D_THREAD_SAFE (synonym # for -D_REENTRANT) and Solaris-specific -D_POSIX_PTHREAD_SEMANTICS. # diff --git a/libpq/libpq/pg_config.h b/libpq/libpq/pg_config.h index 12d418e..fcea042 100644 --- a/libpq/libpq/pg_config.h +++ b/libpq/libpq/pg_config.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ @@ -189,6 +188,7 @@ # define HAVE_DLOPEN 1 # define HAVE_PREAD 1 # define HAVE_PWRITE 1 + /* * Specific for Windows. */ @@ -197,10 +197,14 @@ # define HAVE_DECL_RTLD_GLOBAL 0 # define HAVE_DECL_RTLD_NOW 0 # define HAVE_DECL_POSIX_FADVISE 0 -# define HAVE_GETTIMEOFDAY 1 # define HAVE_ISINF 1 # define HAVE_FUNCNAME__FUNCTION 1 # define USE_REPL_SNPRINTF 1 + +/* + * This is not a mistake, the macro is defined opposite to the norm. + */ +# define HAVE_GETTIMEOFDAY 1 #endif /* diff --git a/libpq/libpq/pg_config_ext.h b/libpq/libpq/pg_config_ext.h index e3a9abe..22ec6d9 100644 --- a/libpq/libpq/pg_config_ext.h +++ b/libpq/libpq/pg_config_ext.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config_ext.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/libpq/pg_config_os.h b/libpq/libpq/pg_config_os.h index e616265..c3299fe 100644 --- a/libpq/libpq/pg_config_os.h +++ b/libpq/libpq/pg_config_os.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config_os.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/libpq/pg_config_paths.h b/libpq/libpq/pg_config_paths.h index 2e67511..7c10791 100644 --- a/libpq/libpq/pg_config_paths.h +++ b/libpq/libpq/pg_config_paths.h @@ -1,5 +1,4 @@ /* file : libpq/pg_config_paths.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/libpq/version.h.in b/libpq/libpq/version.h.in index 0dec491..0a4b4ee 100644 --- a/libpq/libpq/version.h.in +++ b/libpq/libpq/version.h.in @@ -1,5 +1,4 @@ /* file : libpq/version.h.in -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/manifest b/libpq/manifest index ec259b5..4e1734c 100644 --- a/libpq/manifest +++ b/libpq/manifest @@ -3,7 +3,7 @@ name: libpq # Note: remember to update doc-url below! # -version: 12.1.0+1 +version: 12.1.0+2 upstream-version: 12.1 project: postgresql diff --git a/libpq/tests/build/bootstrap.build b/libpq/tests/build/bootstrap.build index 6212d9b..661c471 100644 --- a/libpq/tests/build/bootstrap.build +++ b/libpq/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file project = # Unnamed subproject. diff --git a/libpq/tests/build/root.build b/libpq/tests/build/root.build index e374ddd..9f8a77a 100644 --- a/libpq/tests/build/root.build +++ b/libpq/tests/build/root.build @@ -1,5 +1,4 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file using c diff --git a/libpq/tests/buildfile b/libpq/tests/buildfile index 098486c..badf6d0 100644 --- a/libpq/tests/buildfile +++ b/libpq/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file ./: {*/ -build/} diff --git a/libpq/tests/conninfo/buildfile b/libpq/tests/conninfo/buildfile index d9d4bab..a7c3d59 100644 --- a/libpq/tests/conninfo/buildfile +++ b/libpq/tests/conninfo/buildfile @@ -1,5 +1,4 @@ # file : tests/conninfo/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file # Here we reproduce the upstream's libpq test. See the diff --git a/libpq/tests/conninfo/driver.c b/libpq/tests/conninfo/driver.c index 1a13af2..2107ac9 100644 --- a/libpq/tests/conninfo/driver.c +++ b/libpq/tests/conninfo/driver.c @@ -1,5 +1,4 @@ /* file : tests/conninfo/driver.c - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/tests/conninfo/postgres_fe.h b/libpq/tests/conninfo/postgres_fe.h index 0dd2ed2..d22d43c 100644 --- a/libpq/tests/conninfo/postgres_fe.h +++ b/libpq/tests/conninfo/postgres_fe.h @@ -1,5 +1,4 @@ /* file : tests/conninfo/postgres_fe.h - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : PostgreSQL License; see accompanying COPYRIGHT file */ diff --git a/libpq/tests/conninfo/testscript b/libpq/tests/conninfo/testscript index bf278ae..9613a81 100644 --- a/libpq/tests/conninfo/testscript +++ b/libpq/tests/conninfo/testscript @@ -1,5 +1,4 @@ # file : tests/conninfo/testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : PostgreSQL License; see accompanying COPYRIGHT file $* <<<$src_base/regress.in >>>$src_base/expected.out 2>&1 -- cgit v1.1