From b101114b82dba39cc58b66dbc870f2ef613afbcf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 25 Nov 2017 12:12:14 -0500 Subject: [PATCH] postgresql: bump to 10.1 - Add a hash for the license file. - PostgreSQL 10.0 and above will default to checking for /dev/urandom if an SSL library is not found, which will fail when cross compiling. Since /dev/urandom is guaranteed to be provided on Linux systems, add ac_cv_file__dev_urandom=yes to the configure environment if a SSL library is not selected. Signed-off-by: Adam Duskett [Thomas: minor tweaks to the /dev/urandom comment in the .mk file.] Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 7 ++++--- package/postgresql/postgresql.mk | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index e62838911e..e2347701c1 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,5 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.6/postgresql-9.6.6.tar.bz2.sha256 -sha256 399cdffcb872f785ba67e25d275463d74521566318cfef8fe219050d063c8154 postgresql-9.6.6.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v10.1/postgresql-10.1.tar.bz2.sha256 +sha256 3ccb4e25fe7a7ea6308dea103cac202963e6b746697366d72ec2900449a5e713 postgresql-10.1.tar.bz2 + # License file, Locally calculated -sha256 7dc8de32741ad1b03e21710771b55a1b9d460671d47f28a8840f917e38c66676 COPYRIGHT +sha256 7dc8de32741ad1b03e21710771b55a1b9d460671d47f28a8840f917e38c66676 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 50ce212c1c..4657489a53 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.6.6 +POSTGRESQL_VERSION = 10.1 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL @@ -56,6 +56,11 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) POSTGRESQL_DEPENDENCIES += openssl POSTGRESQL_CONF_OPTS += --with-openssl +else +# PostgreSQL checks for /dev/urandom and fails if it's being cross-compiled and +# an SSL library isn't found. Since /dev/urandom is guaranteed to be provided +# on Linux systems, explicitly tell the configure script it's available. +POSTGRESQL_CONF_ENV += ac_cv_file__dev_urandom=yes endif ifeq ($(BR2_PACKAGE_OPENLDAP),y) -- 2.30.2