[packages/postgresql/POSTGRESQL_16] up to 16.1 (requires unreleased version of heimdal for kerberos)

atler atler at pld-linux.org
Sat Dec 16 12:38:27 CET 2023


commit d26471eeb35f1bc7c8c647f31ada27326b4e71b7
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Dec 16 11:32:56 2023 +0100

    up to 16.1 (requires unreleased version of heimdal for kerberos)
    
    postgresql uses gss_store_cred_into() now which heimdal added support
    for in early 2019. it's not part of any released version yet though.

 ac.patch                 |  4 ++--
 postgresql-heimdal.patch |  6 +++---
 postgresql-link.patch    |  4 ++--
 postgresql.spec          | 13 ++++++-------
 4 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/postgresql.spec b/postgresql.spec
index 2664e79..6b23135 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -20,7 +20,7 @@
 					# (disabled by default because it is a security risk)
 #
 
-%define mver 15
+%define mver 16
 
 Summary:	PostgreSQL Data Base Management System
 Summary(de.UTF-8):	PostgreSQL Datenbankverwaltungssystem
@@ -33,12 +33,12 @@ Summary(tr.UTF-8):	Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):	PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql
-Version:	%{mver}.3
-Release:	3
+Version:	%{mver}.1
+Release:	1
 License:	BSD
 Group:		Applications/Databases
 Source0:	https://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	7cb75773ff8fbe533701562c3278206b
+# Source0-md5:	9cbfb9076ed06384471802b850698a6d
 Source1:	%{name}.init
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
@@ -66,7 +66,8 @@ BuildRequires:	docbook-style-xsl-nons
 BuildRequires:	flex >= 2.5.31
 BuildRequires:	gettext-tools
 BuildRequires:	gnome-doc-tools
-%{?with_kerberos5:BuildRequires:	heimdal-devel}
+%{?with_kerberos5:BuildRequires:	heimdal-devel >= 8}
+BuildRequires:	libicu-devel
 %{?with_selinux:BuildRequires:	libselinux-devel >= 2.1.10}
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
@@ -1052,7 +1053,6 @@ fi
 %attr(755,root,root) %{_bindir}/pg_waldump
 %attr(755,root,root) %{_bindir}/pgbench
 %attr(755,root,root) %{_bindir}/postgres
-%attr(755,root,root) %{_bindir}/postmaster
 
 %attr(755,root,root) %{_pgmoduledir}/cyrillic_and_mic.so
 %attr(755,root,root) %{_pgmoduledir}/dict_int.so
@@ -1098,7 +1098,6 @@ fi
 %{_mandir}/man1/pg_upgrade.1*
 %{_mandir}/man1/pgbench.1*
 %{_mandir}/man1/postgres.1*
-%{_mandir}/man1/postmaster.1*
 
 %files doc
 %defattr(644,root,root,755)
diff --git a/ac.patch b/ac.patch
index 4f0e687..6e8bca0 100644
--- a/ac.patch
+++ b/ac.patch
@@ -2,13 +2,13 @@
 +++ postgresql-14.0/configure.ac	2021-11-09 09:38:45.296275820 +0100
 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un
  
- AC_INIT([PostgreSQL], [15.3], [pgsql-bugs at lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [16.1], [pgsql-bugs at 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
 -recommended.  You can remove the check from 'configure.ac' but it is then
 -your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2022, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2023, PostgreSQL Global Development Group])
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
 
diff --git a/postgresql-heimdal.patch b/postgresql-heimdal.patch
index 0b71ce6..ea22033 100644
--- a/postgresql-heimdal.patch
+++ b/postgresql-heimdal.patch
@@ -4,8 +4,8 @@
  
  if test "$with_gssapi" = yes ; then
    if test "$PORTNAME" != "win32"; then
--    AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-+    AC_SEARCH_LIBS(gss_init_sec_context, [gssapi 'gssapi -lkrb5 -lcrypto' gssapi_krb5 gss], [],
-                    [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
+-    AC_SEARCH_LIBS(gss_store_cred_into, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
++    AC_SEARCH_LIBS(gss_store_cred_into, [gssapi 'gssapi -lkrb5 -lcrypto' gssapi_krb5 gss], [],
+                    [AC_MSG_ERROR([could not find function 'gss_store_cred_into' required for GSSAPI])])
    else
      LIBS="$LIBS -lgssapi32"
diff --git a/postgresql-link.patch b/postgresql-link.patch
index 193e480..4f8bc50 100644
--- a/postgresql-link.patch
+++ b/postgresql-link.patch
@@ -35,8 +35,8 @@ diff -urNp -x '*.orig' postgresql-12.4.org/src/backend/Makefile postgresql-12.4/
  ifneq ($(PORTNAME), aix)
  
  postgres: $(OBJS)
--	$(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) -o $@
-+	$(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(LIBS) $(BONJOUR_LIBS) -o $@
+-	$(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) $(BONJOUR_LIBS) -o $@
  
  endif
  endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/postgresql.git/commitdiff/d26471eeb35f1bc7c8c647f31ada27326b4e71b7



More information about the pld-cvs-commit mailing list