From cb3f4cffe9128395baf30660445b02940a03a1c7 Mon Sep 17 00:00:00 2001 From: zhengruoqin Date: Mon, 22 Feb 2021 15:45:05 +0800 Subject: postgresql: upgrade 13.1 -> 13.2 -License-Update: Copyright year updated to 2021. Upgrade patches to fix ERROR: postgresql-13.2-r0 do_patch: Fuzz detected: Applying patch 0001-configure.in-bypass-autoconf-2.69-version-check.patch patching file configure.in Hunk #1 succeeded at 19 with fuzz 2. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../postgresql/files/0001-Add-support-for-RISC-V.patch | 5 ----- .../postgresql/files/0001-Improve-reproducibility.patch | 7 +------ ...001-configure.in-bypass-autoconf-2.69-version-check.patch | 9 ++------- meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch | 7 +------ meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb | 12 ------------ meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb | 12 ++++++++++++ 6 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb create mode 100644 meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb (limited to 'meta-oe/recipes-dbs/postgresql') diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch index 865ad3287b..0dc6ece6da 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Add-support-for-RISC-V.patch @@ -9,8 +9,6 @@ extending the existing aarch64 macro works. src/include/storage/s_lock.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h -index 3fe29ce..7cd578f 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -316,11 +316,12 @@ tas(volatile slock_t *lock) @@ -36,6 +34,3 @@ index 3fe29ce..7cd578f 100644 /* S/390 and S/390x Linux (32- and 64-bit zSeries) */ --- -2.9.3 - diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch b/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch index 60b7910c5d..e9bc6240de 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-Improve-reproducibility.patch @@ -22,11 +22,9 @@ Signed-off-by: Changqing Li src/common/Makefile | 3 --- 1 file changed, 3 deletions(-) -diff --git a/src/common/Makefile b/src/common/Makefile -index 16619e4..665eaa1 100644 --- a/src/common/Makefile +++ b/src/common/Makefile -@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.global +@@ -31,9 +31,6 @@ include $(top_builddir)/src/Makefile.glo # don't include subdirectory-path-dependent -I and -L switches STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS)) STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS)) @@ -36,6 +34,3 @@ index 16619e4..665eaa1 100644 override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\"" override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\"" override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\"" --- -2.17.1 - diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch index c54a886a25..970d750b13 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-configure.in-bypass-autoconf-2.69-version-check.patch @@ -12,13 +12,11 @@ Signed-off-by: Yi Fan Yu configure.in | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/configure.in b/configure.in -index 8d4e9ac..75203c2 100644 --- a/configure.in +++ b/configure.in -@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros +@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un - AC_INIT([PostgreSQL], [13.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [13.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -27,6 +25,3 @@ index 8d4e9ac..75203c2 100644 AC_COPYRIGHT([Copyright (c) 1996-2020, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) --- -2.29.2 - diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index 22b62d9ded..ba2ee29f05 100644 --- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch @@ -19,11 +19,9 @@ Signed-off-by: Changqing Li configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index b98b9bb..8584677 100644 --- a/configure.in +++ b/configure.in -@@ -2211,7 +2211,7 @@ Use --without-tcl to disable building PL/Tcl.]) +@@ -2206,7 +2206,7 @@ Use --without-tcl to disable building PL fi # check for @@ -32,6 +30,3 @@ index b98b9bb..8584677 100644 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $perl_includespec" AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file is required for Perl])], --- -2.7.4 - diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb b/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb deleted file mode 100644 index f2a29a59d9..0000000000 --- a/meta-oe/recipes-dbs/postgresql/postgresql_13.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc4ce21960f0c561460d750bc270d11f" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ - file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ -" - -SRC_URI[sha256sum] = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f" diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb new file mode 100644 index 0000000000..ca8a6c7cee --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/postgresql_13.2.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=255f15687738db8068fbe9b938c90217" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ + file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ +" + +SRC_URI[sha256sum] = "5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc" -- cgit v1.2.3-54-g00ecf