[packages/postgresql] Up to 16.4; postmaster symlink is no longer used/installed; unreleased heimdal is needed for kerbero
arekm
arekm at pld-linux.org
Tue Aug 27 15:46:13 CEST 2024
commit c76e3d40236043a33364fa7c4c6dbe7b42a059fe
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Aug 27 15:05:02 2024 +0200
Up to 16.4; postmaster symlink is no longer used/installed; unreleased heimdal is needed for kerberos support
ac.patch | 4 ++--
postgresql-heimdal.patch | 14 ++++++++------
postgresql-link.patch | 42 ------------------------------------------
postgresql.init | 6 +++---
postgresql.spec | 14 +++++---------
5 files changed, 18 insertions(+), 62 deletions(-)
---
diff --git a/postgresql.spec b/postgresql.spec
index 0a223c0..b96660a 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}.6
-Release: 2
+Version: %{mver}.4
+Release: 1
License: BSD
Group: Applications/Databases
Source0: https://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 666511aeb53bd4ac029e236e35b42ca8
+# Source0-md5: bdcc1e350b473c13d132d190c0c18499
Source1: %{name}.init
Source2: pgsql-Database-HOWTO-html.tar.gz
# Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -51,7 +51,6 @@ Patch1: %{name}-absolute_dbpaths.patch
Patch2: %{name}-ecpg-includedir.patch
Patch3: ac.patch
Patch5: %{name}-heimdal.patch
-Patch6: %{name}-link.patch
URL: https://www.postgresql.org/
BuildRequires: autoconf >= 2.69
BuildRequires: automake
@@ -65,7 +64,7 @@ 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.0}
%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.10}
BuildRequires: libtool
BuildRequires: libuuid-devel
@@ -802,7 +801,6 @@ Różne moduły dołączone do PostgreSQL-a.
%patch2 -p1
%patch3 -p1
%patch5 -p1
-%patch6 -p1
# force rebuild of bison/flex files
find src -name \*.l -o -name \*.y | xargs touch
@@ -1050,7 +1048,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
@@ -1096,7 +1093,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 ba1632a..385f62a 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.6], [pgsql-bugs at lists.postgresql.org], [], [https://www.postgresql.org/])
+ AC_INIT([PostgreSQL], [16.4], [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..a5515a6 100644
--- a/postgresql-heimdal.patch
+++ b/postgresql-heimdal.patch
@@ -1,11 +1,13 @@
---- postgresql-9.4.0/configure.ac~ 2014-12-16 02:07:34.000000000 +0100
-+++ postgresql-9.4.0/configure.ac 2014-12-24 13:10:18.706719940 +0100
-@@ -946,7 +946,7 @@
+--- postgresql-16.4/configure.ac~ 2024-08-27 11:36:48.000000000 +0200
++++ postgresql-16.4/configure.ac 2024-08-27 11:37:32.276559352 +0200
+@@ -1340,8 +1340,8 @@ fi
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_MSG_ERROR([could not find function 'gss_store_cred_into' required for GSSAPI])])
++ 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"
+ fi
diff --git a/postgresql-link.patch b/postgresql-link.patch
deleted file mode 100644
index 193e480..0000000
--- a/postgresql-link.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urNp -x '*.orig' postgresql-12.4.org/configure.ac postgresql-12.4/configure.ac
---- postgresql-12.4.org/configure.ac 2021-11-09 09:31:36.707897270 +0100
-+++ postgresql-12.4/configure.ac 2021-11-09 09:31:40.651435766 +0100
-@@ -1470,6 +1470,7 @@ fi
-
- if test "$with_bonjour" = yes ; then
- AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
-+ AC_CHECK_LIB(dns_sd, DNSServiceRegister, [BONJOUR_LIBS=-ldns_sd])
- dnl At some point we might add something like
- dnl AC_SEARCH_LIBS(DNSServiceRegister, dns_sd)
- dnl but right now, what that would mainly accomplish is to encourage
-@@ -1477,6 +1478,7 @@ dnl people to try to use the avahi imple
- dnl If you want to use Apple's own Bonjour code on another platform,
- dnl just add -ldns_sd to LIBS manually.
- fi
-+AC_SUBST([BONJOUR_LIBS])
-
- # for contrib/uuid-ossp
- if test "$with_uuid" = bsd ; then
-diff -urNp -x '*.orig' postgresql-12.4.org/src/Makefile.global.in postgresql-12.4/src/Makefile.global.in
---- postgresql-12.4.org/src/Makefile.global.in 2020-08-10 23:15:53.000000000 +0200
-+++ postgresql-12.4/src/Makefile.global.in 2021-11-09 09:31:40.651435766 +0100
-@@ -173,6 +173,7 @@ includedir_internal = $(pkgincludedir)/i
- pgxsdir = $(pkglibdir)/pgxs
- bitcodedir = $(pkglibdir)/bitcode
-
-+BONJOUR_LIBS = @BONJOUR_LIBS@
-
- ##########################################################################
- #
-diff -urNp -x '*.orig' postgresql-12.4.org/src/backend/Makefile postgresql-12.4/src/backend/Makefile
---- postgresql-12.4.org/src/backend/Makefile 2020-08-10 23:15:53.000000000 +0200
-+++ postgresql-12.4/src/backend/Makefile 2021-11-09 09:31:40.651435766 +0100
-@@ -60,7 +60,7 @@ ifneq ($(PORTNAME), win32)
- 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 $@
-
- endif
- endif
diff --git a/postgresql.init b/postgresql.init
index 647f2ec..1b1d143 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -8,7 +8,7 @@
# description: Starts and stops the PostgreSQL backend daemon that handles \
# all database requests.
#
-# processname: postmaster
+# processname: postgres
cd /
@@ -68,7 +68,7 @@ fi
#
# sets variables:
# PG_STATUS = running | not running
-# PG_PID = pid of postmaster process
+# PG_PID = pid of postgres process
#
pgstatus() {
PG_STATUS="unknown"
@@ -122,7 +122,7 @@ start() {
pgstatus "$pgdir"
if [ "$PG_STATUS" = "running" ]; then
# pg_ctl status can misinform us about postgresql status
- # so let's check if postmaster is really alive
+ # so let's check if postgres is really alive
if ps -p "$PG_PID" >/dev/null; then
msg_already_running "PostgreSQL $pgdir"
else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postgresql.git/commitdiff/c76e3d40236043a33364fa7c4c6dbe7b42a059fe
More information about the pld-cvs-commit
mailing list