[packages/postgresql/POSTGRESQL_9_3] Build fixes

[arekm]

commit a9d9f5518d9fb7fbd6bfd7678ff781fae3272c8a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Aug 26 13:24:49 2025 +0200

    Build fixes

 build.patch              | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
 postgresql-heimdal.patch |  9 ++++---
 postgresql.spec          | 19 ++++++--------
 3 files changed, 77 insertions(+), 15 deletions(-)
---
diff --git a/postgresql.spec b/postgresql.spec
index c2d7cdc..256104e 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -53,6 +53,7 @@ Patch2:		%{name}-ecpg-includedir.patch
 Patch3:		%{name}-ac_version.patch
 Patch4:		%{name}-disable_horology_test.patch
 Patch5:		%{name}-heimdal.patch
+Patch6:		build.patch
 URL:		http://www.postgresql.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -777,12 +778,13 @@ Różne moduły dołączone do PostgreSQL-a.
 
 %prep
 %setup -q
-%patch0 -p1
-%{?with_absolute_dbpaths:%patch1 -p1}
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch -P0 -p1
+%{?with_absolute_dbpaths:%patch -P1 -p1}
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
 
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch
@@ -950,11 +952,6 @@ fi
 %groupadd -g 88 -r postgres
 %useradd -M -o -r -u 88 -d /home/services/postgres -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
-%triggerpostun -- %{name} < 7.2-2
-if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
-	/usr/sbin/usermod -d /home/services/postgres postgres
-fi
-
 %post
 /sbin/chkconfig --add postgresql
 %service postgresql restart "postgresql server"
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..b4c5d3f
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,64 @@
+--- postgresql-9.3.25/config/c-compiler.m4~	2025-08-26 12:14:27.950791233 +0200
++++ postgresql-9.3.25/config/c-compiler.m4	2025-08-26 12:14:31.784383880 +0200
+@@ -61,7 +61,9 @@ AC_DEFUN([PGAC_TYPE_64BIT_INT],
+ define([Ac_cachevar], [translit([pgac_cv_type_$1_64], [ *], [_p])])dnl
+ AC_CACHE_CHECK([whether $1 is 64 bits], [Ac_cachevar],
+ [AC_TRY_RUN(
+-[typedef $1 ac_int64;
++[#include <unistd.h>
++#include <stdlib.h>
++typedef $1 ac_int64;
+ 
+ /*
+  * These are globals to discourage the compiler from folding all the
+--- postgresql-9.3.25/config/c-library.m4~	2018-11-05 22:53:28.000000000 +0100
++++ postgresql-9.3.25/config/c-library.m4	2025-08-26 12:13:33.993808107 +0200
+@@ -42,6 +42,7 @@ fi
+ AC_CACHE_CHECK(for tzname, ac_cv_var_tzname,
+ [AC_TRY_LINK(
+ [#include <time.h>
++#include <stdlib.h>
+ #ifndef tzname /* For SGI.  */
+ extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
+ #endif
+--- postgresql-9.3.25/config/c-compiler.m4~	2025-08-26 12:15:11.363727796 +0200
++++ postgresql-9.3.25/config/c-compiler.m4	2025-08-26 12:18:25.716874356 +0200
+@@ -86,7 +86,7 @@ int does_int64_work()
+     return 0;
+   return 1;
+ }
+-main() {
++int main() {
+   exit(! does_int64_work());
+ }],
+ [Ac_cachevar=yes],
+--- postgresql-9.3.25/src/backend/utils/adt/xml.c~	2018-11-05 22:53:28.000000000 +0100
++++ postgresql-9.3.25/src/backend/utils/adt/xml.c	2025-08-26 12:22:25.676439210 +0200
+@@ -117,7 +117,7 @@ struct PgXmlErrorContext
+ 
+ static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID,
+ 				  xmlParserCtxtPtr ctxt);
+-static void xml_errorHandler(void *data, xmlErrorPtr error);
++static void xml_errorHandler(void *data, const xmlError *error);
+ static void xml_ereport_by_code(int level, int sqlcode,
+ 					const char *msg, int errcode);
+ static void chopStringInfoNewlines(StringInfo str);
+@@ -1559,7 +1559,7 @@ xml_ereport(PgXmlErrorContext *errcxt, i
+  * Error handler for libxml errors and warnings
+  */
+ static void
+-xml_errorHandler(void *data, xmlErrorPtr error)
++xml_errorHandler(void *data, const xmlError *error)
+ {
+ 	PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data;
+ 	xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;
+--- postgresql-9.3.25/src/pl/plpython/plpython.h~	2018-11-05 22:53:28.000000000 +0100
++++ postgresql-9.3.25/src/pl/plpython/plpython.h	2025-08-26 13:16:59.697893953 +0200
+@@ -121,7 +121,6 @@ typedef int Py_ssize_t;
+ #define TEXTDOMAIN PG_TEXTDOMAIN("plpython")
+ 
+ #include <compile.h>
+-#include <eval.h>
+ 
+ /* put back our snprintf and vsnprintf */
+ #ifdef USE_REPL_SNPRINTF
diff --git a/postgresql-heimdal.patch b/postgresql-heimdal.patch
index f54ffe8..391c341 100644
--- a/postgresql-heimdal.patch
+++ b/postgresql-heimdal.patch
@@ -1,6 +1,7 @@
---- postgresql-9.0.0/configure.in.orig	2010-10-03 11:14:32.231741882 +0200
-+++ postgresql-9.0.0/configure.in	2010-10-03 11:46:29.767741043 +0200
-@@ -906,7 +906,7 @@
+diff -urN postgresql-9.3.25.org/configure.in postgresql-9.3.25/configure.in
+--- postgresql-9.3.25.org/configure.in	2025-08-26 12:09:28.677212907 +0200
++++ postgresql-9.3.25/configure.in	2025-08-26 12:09:58.419224934 +0200
+@@ -969,7 +969,7 @@
  
  if test "$with_gssapi" = yes ; then
    if test "$PORTNAME" != "win32"; then
@@ -9,7 +10,7 @@
  		 		  [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
    else
      LIBS="$LIBS -lgssapi32"
-@@ -915,7 +915,7 @@
+@@ -978,7 +978,7 @@
  
  if test "$with_krb5" = yes ; then
    if test "$PORTNAME" != "win32"; then
================================================================

---- gitweb:

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