Merge 11/11/2018 master

.dir-locals.el

@@ -5,10 +5,10 @@
             (fill-column . 78)
             (indent-tabs-mode . t)
             (tab-width . 4)))
- (dsssl-mode . ((indent-tabs-mode . nil)))
- (nxml-mode . ((indent-tabs-mode . nil)))
+ (nxml-mode . ((fill-column . 78)
+               (indent-tabs-mode . nil)))
  (perl-mode . ((perl-indent-level . 4)
-               (perl-continued-statement-offset . 4)
+               (perl-continued-statement-offset . 2)
                (perl-continued-brace-offset . 4)
                (perl-brace-offset . 0)
                (perl-brace-imaginary-offset . 0)

.gitignore

@@ -1,6 +1,7 @@
 # Global excludes across all subdirectories
 *.o
 *.obj
+*.bc
 *.so
 *.so.[0-9]
 *.so.[0-9].[0-9]
@@ -21,8 +22,9 @@ objfiles.txt
 *.gcda
 *.gcov
 *.gcov.out
-lcov.info
+lcov*.info
 coverage/
+coverage-html-stamp
 *.vcproj
 *.vcxproj
 win32ver.rc

CMakeLists.txt

@@ -25,7 +25,7 @@ set(POSTGRES_VERSION
   ${POSTGRES_MAJOR_VERSION}.${POSTGRES_MINOR_VERSION}.${POSTGRES_PATCH_VERSION})
 
 set(PG_VERSION "11devel")
-set(PG_VERSION_NUM 100000)
+set(PG_VERSION_NUM 110000)
 set(PACKAGE_BUGREPORT "[email protected]")
 
  # Offer the user the choice of overriding the installation directories
@@ -286,6 +286,15 @@ if(USE_BONJOUR)
 	endif()
 endif()
 
+option(WITH_SYSTEM_TZDATA "Define to use system tzdata information." OFF)
+if (WITH_SYSTEM_TZDATA)
+	if (EXISTS ${WITH_SYSTEM_TZDATA})
+		add_compile_options(-DSYSTEMTZDIR="${WITH_SYSTEM_TZDATA}")
+	else()
+		message(FATAL_ERROR "tzdata directory \"${WITH_SYSTEM_TZDATA}\" does not exists")
+	endif()
+endif()
+
 option(STRONG_RANDOM "Strong random number source" ON)
 option(STRONG_RANDOM_SOURCE "which random number source to use - openssl, win32, dev" OFF)
 if(STRONG_RANDOM)
@@ -691,6 +700,11 @@ if(OPENSSL_FOUND)
 	set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}")
 	set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
 	check_function_exists(SSL_get_current_compression HAVE_SSL_GET_CURRENT_COMPRESSION)
+	check_function_exists(BIO_get_data HAVE_BIO_GET_DATA)
+	check_function_exists(BIO_meth_new HAVE_BIO_METH_NEW)
+	message(STATUS "OpenSSL version: ${OPENSSL_VERSION} libs: ${OPENSSL_LIBRARIES} include: ${OPENSSL_INCLUDE_DIR}")
+else()
+	message(STATUS "OpenSSL: off")
 endif(OPENSSL_FOUND)
 
 if(USE_SYSTEMD)

COPYRIGHT

@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
 (formerly known as Postgres, then as Postgres95)
 
-Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 

GNUmakefile.in

@@ -63,7 +63,7 @@ distclean maintainer-clean:
 	@rm -rf autom4te.cache/
 	rm -f config.cache config.log config.status GNUmakefile
 
-check check-tests installcheck installcheck-parallel installcheck-tests:
+check check-tests installcheck installcheck-parallel installcheck-tests: submake-generated-headers
 	$(MAKE) -C src/test/regress $@
 
 $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,check)
@@ -78,7 +78,6 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
 
 distdir	= postgresql-$(VERSION)
 dummy	= =install=
-garbage = =*  "#"*  ."#"*  *~*  *.orig  *.rej  core  postgresql-*
 
 dist: $(distdir).tar.gz $(distdir).tar.bz2
 	rm -rf $(distdir)

Makefile

@@ -11,6 +11,10 @@
 # GNUmakefile won't exist yet, so we catch that case as well.
 
 
+# AIX make defaults to building *every* target of the first rule.  Start with
+# a single-target, empty rule to make the other targets non-default.
+all:
+
 all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world check-world install-world installcheck-world:
 	@if [ ! -f GNUmakefile ] ; then \
 	   echo "You need to run the 'configure' program first. See the file"; \

aclocal.m4

@@ -7,6 +7,7 @@ m4_include([config/c-library.m4])
 m4_include([config/docbook.m4])
 m4_include([config/general.m4])
 m4_include([config/libtool.m4])
+m4_include([config/llvm.m4])
 m4_include([config/perl.m4])
 m4_include([config/pkg.m4])
 m4_include([config/programs.m4])