Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Honza Horak
7bffd7e336 Update sources file to be able to build from scm directly 2024-02-15 11:20:52 +01:00
Honza Horak
e471e88693 Test v17devel 2024-02-15 11:11:03 +01:00
5 changed files with 53 additions and 39 deletions

2
.gitignore vendored
View file

@ -3,3 +3,5 @@
/postgresql-16.1.tar.bz2
/postgresql-16.1.tar.bz2.sha256
/postgresql-setup-8.9.tar.gz
/postgresql-17devel.tar.bz2
/postgresql-17devel.tar.bz2.sha256

View file

@ -1,7 +1,7 @@
diff -up postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample
--- postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample 2022-09-27 16:57:00.652909198 +0200
+++ postgresql-15.0/src/backend/utils/misc/postgresql.conf.sample 2022-09-27 17:01:56.073606108 +0200
@@ -449,7 +449,7 @@
diff -up postgresql-17devel/src/backend/utils/misc/postgresql.conf.samplepatch2 postgresql-17devel/src/backend/utils/misc/postgresql.conf.sample
--- postgresql-17devel/src/backend/utils/misc/postgresql.conf.samplepatch2 2024-01-22 01:20:02.000000000 +0100
+++ postgresql-17devel/src/backend/utils/misc/postgresql.conf.sample 2024-02-02 09:00:38.532730471 +0100
@@ -460,7 +460,7 @@
# logging_collector to be on.
# This is used when logging to stderr:
@ -10,13 +10,13 @@ diff -up postgresql-15.0_original/src/backend/utils/misc/postgresql.conf.sample
# and csvlog into log files. Required
# to be on for csvlogs and jsonlogs.
# (change requires restart)
@@ -457,16 +457,16 @@
@@ -468,16 +468,16 @@
# These are only used if logging_collector is on:
#log_directory = 'log' # directory where log files are written,
# can be absolute or relative to PGDATA
-#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern,
+log_filename = 'postgresql-%a.log' # log file name pattern,
# can include strftime() escapes
# can include strftime() escapes
#log_file_mode = 0600 # creation mode for log files,
# begin with 0 to use octal notation
-#log_rotation_age = 1d # Automatic rotation of logfiles will

View file

@ -6,50 +6,50 @@ rhbz#1618698 change, rather provide pg_server_config binary, which int urn means
that we'll have to fix only a minimal set of packages which really build
PostgreSQL server modules.
diff -ur postgresql-16beta1/src/bin/pg_config/Makefile postgresql16_pg_config_patch/src/bin/pg_config/Makefile
--- postgresql-16beta1/src/bin/pg_config/Makefile 2023-05-22 23:08:08.000000000 +0200
+++ postgresql16_pg_config_patch/src/bin/pg_config/Makefile 2023-06-05 13:51:30.000000000 +0200
diff -up postgresql-17devel/src/bin/pg_config/Makefile.patch9 postgresql-17devel/src/bin/pg_config/Makefile
--- postgresql-17devel/src/bin/pg_config/Makefile.patch9 2024-01-04 05:20:21.000000000 +0100
+++ postgresql-17devel/src/bin/pg_config/Makefile 2024-02-02 09:03:49.186063096 +0100
@@ -11,6 +11,8 @@
PGFILEDESC = "pg_config - report configuration information"
PGAPPICON=win32
+PG_CONFIG = pg_server_config$(X)
+
subdir = src/bin/pg_config
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
@@ -19,22 +21,22 @@
@@ -19,22 +21,22 @@ OBJS = \
$(WIN32RES) \
pg_config.o
-all: pg_config
+all: $(PG_CONFIG)
-pg_config: $(OBJS) | submake-libpgport
- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
+$(PG_CONFIG): $(OBJS) | submake-libpgport
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
install: all installdirs
- $(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
+ $(INSTALL_SCRIPT) $(PG_CONFIG) '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
installdirs:
$(MKDIR_P) '$(DESTDIR)$(bindir)'
uninstall:
- rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
+ rm -f '$(DESTDIR)$(bindir)/$(PG_CONFIG)'
clean distclean maintainer-clean:
clean distclean:
- rm -f pg_config$(X) $(OBJS)
+ rm -f $(PG_CONFIG) $(OBJS)
rm -rf tmp_check
check:
diff -ur postgresql-16beta1/src/bin/pg_config/nls.mk postgresql16_pg_config_patch/src/bin/pg_config/nls.mk
--- postgresql-16beta1/src/bin/pg_config/nls.mk 2023-05-22 23:08:08.000000000 +0200
+++ postgresql16_pg_config_patch/src/bin/pg_config/nls.mk 2023-06-05 13:49:37.000000000 +0200
diff -up postgresql-17devel/src/bin/pg_config/nls.mk.patch9 postgresql-17devel/src/bin/pg_config/nls.mk
--- postgresql-17devel/src/bin/pg_config/nls.mk.patch9 2022-07-13 10:20:02.000000000 +0200
+++ postgresql-17devel/src/bin/pg_config/nls.mk 2024-02-02 09:01:57.260868411 +0100
@@ -1,3 +1,3 @@
# src/bin/pg_config/nls.mk
-CATALOG_NAME = pg_config

View file

@ -22,7 +22,7 @@
%{!?icu:%global icu 1}
%{!?kerberos:%global kerberos 1}
%{!?ldap:%global ldap 1}
%{!?nls:%global nls 1}
%{!?nls:%global nls 0}
%{!?uuid:%global uuid 1}
%{!?xml:%global xml 1}
%{!?pam:%global pam 1}
@ -32,7 +32,7 @@
%{!?postgresql_default:%global postgresql_default 1}
%global majorname postgresql
%global majorversion 16
%global majorversion 17devel
# By default, patch(1) creates backup files when chunks apply with offsets.
# Turn that off to ensure such files don't get included in RPMs.
@ -47,8 +47,8 @@
Summary: PostgreSQL client programs
Name: %{majorname}%{majorversion}
Version: %{majorversion}.1
Release: 5%{?dist}
Version: %{majorversion}
Release: 4.alternative%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@ -95,7 +95,7 @@ Patch9: postgresql-server-pg_config.patch
# rhbz#1940964
Patch10: postgresql-datalayout-mismatch-on-s390.patch
Patch12: postgresql-no-libecpg.patch
Patch13: postgresql-libxml2.patch
#Patch13: postgresql-libxml2.patch
Patch14: postgresql15-libxml2.patch
# This macro is used for package names in the files section
@ -113,6 +113,7 @@ BuildRequires: gcc
BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
BuildRequires: perl(ExtUtils::Embed), perl-devel
BuildRequires: perl(Opcode)
BuildRequires: perl(FindBin)
%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: perl-generators
%endif
@ -519,7 +520,6 @@ goal of accelerating analytics queries.
%endif
%patch 9 -p1
%patch 10 -p1
%patch 13 -p1
%if ! %external_libpq
@ -974,7 +974,8 @@ make -C postgresql-setup-%{setup_version} check
%endif
# FILES sections.
%files -f main.lst -n %{pkgname}
#%%files -f main.lst -n %{pkgname}
%files -n %{pkgname}
%doc doc/KNOWN_BUGS doc/MISSING_FEATURES doc/TODO
%doc COPYRIGHT README HISTORY
%doc README.rpm-dist
@ -1023,7 +1024,8 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/tutorial/
%files -n %{pkgname}-contrib -f contrib.lst
%files -n %{pkgname}-contrib
#-f contrib.lst
%doc contrib/spi/*.example
%{_bindir}/oid2name
%{_bindir}/pg_amcheck
@ -1031,6 +1033,8 @@ make -C postgresql-setup-%{setup_version} check
%{_bindir}/pg_test_fsync
%{_bindir}/pg_test_timing
%{_bindir}/pg_waldump
%{_bindir}/pg_combinebackup
%{_bindir}/pg_walsummary
%{_bindir}/pgbench
%{_bindir}/vacuumlo
%{_datadir}/pgsql/extension/adminpack*
@ -1061,7 +1065,7 @@ make -C postgresql-setup-%{setup_version} check
%{_datadir}/pgsql/extension/lo*
%{_datadir}/pgsql/extension/ltree*
%{_datadir}/pgsql/extension/moddatetime*
%{_datadir}/pgsql/extension/old_snapshot*
#%%{_datadir}/pgsql/extension/old_snapshot*
%{_datadir}/pgsql/extension/pageinspect*
%{_datadir}/pgsql/extension/pg_buffercache*
%{_datadir}/pgsql/extension/pg_freespacemap*
@ -1120,7 +1124,7 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/ltree_plpython3.so
%endif
%{_libdir}/pgsql/moddatetime.so
%{_libdir}/pgsql/old_snapshot.so
#%%{_libdir}/pgsql/old_snapshot.so
%{_libdir}/pgsql/pageinspect.so
%{_libdir}/pgsql/passwordcheck.so
%{_libdir}/pgsql/pg_buffercache.so
@ -1153,6 +1157,8 @@ make -C postgresql-setup-%{setup_version} check
%{_mandir}/man1/pg_waldump.*
%{_mandir}/man1/pgbench.*
%{_mandir}/man1/vacuumlo.*
%{_mandir}/man1/pg_combinebackup.1.gz
%{_mandir}/man1/pg_walsummary.1.gz
%{_mandir}/man3/dblink*
%if %selinux
%{_datadir}/pgsql/contrib/sepgsql.sql
@ -1171,7 +1177,8 @@ make -C postgresql-setup-%{setup_version} check
%{_libdir}/pgsql/pgxml.so
%endif
%files -n %{pkgname}-server -f server.lst
%files -n %{pkgname}-server
#-f server.lst
%{_bindir}/initdb
%{_bindir}/pg_basebackup
%{_bindir}/pg_controldata
@ -1241,7 +1248,8 @@ make -C postgresql-setup-%{setup_version} check
%endif
%files -n %{pkgname}-server-devel -f devel.lst
%files -n %{pkgname}-server-devel
#-f devel.lst
%{_bindir}/pg_server_config
%dir %{_datadir}/pgsql
%{_datadir}/pgsql/errcodes.txt
@ -1261,6 +1269,7 @@ make -C postgresql-setup-%{setup_version} check
%{_includedir}/postgres_ext.h
%{_includedir}/pgsql/internal/*.h
%{_includedir}/pgsql/internal/libpq/pqcomm.h
%{_includedir}/pgsql/internal/libpq/protocol.h
%{_includedir}/libpq/*.h
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libpq.so
@ -1307,7 +1316,8 @@ make -C postgresql-setup-%{setup_version} check
%endif
%if %plperl
%files -n %{pkgname}-plperl -f plperl.lst
%files -n %{pkgname}-plperl
#-f plperl.lst
%{_datadir}/pgsql/extension/bool_plperl*
%{_datadir}/pgsql/extension/plperl*
%{_libdir}/pgsql/bool_plperl.so
@ -1316,14 +1326,16 @@ make -C postgresql-setup-%{setup_version} check
%if %pltcl
%files -n %{pkgname}-pltcl -f pltcl.lst
%files -n %{pkgname}-pltcl
#-f pltcl.lst
%{_datadir}/pgsql/extension/pltcl*
%{_libdir}/pgsql/pltcl.so
%endif
%if %plpython3
%files -n %{pkgname}-plpython3 -f plpython3.lst
%files -n %{pkgname}-plpython3
#-f plpython3.lst
%{_datadir}/pgsql/extension/plpython3*
%{_libdir}/pgsql/plpython3.so
%endif

View file

@ -1,5 +1,5 @@
SHA512 (postgresql-15.5.tar.bz2) = 9ed9d160b3cef99954ccd47a970c107b7e3b0196a7d848f740bf3c52a1c626f6f457814c97f37b9f0467bb07734e19806a15bd9cf3c39445e1d89e75b37064cc
SHA512 (postgresql-15.5.tar.bz2.sha256) = 896ad3a1952f54bc5186d49eb4faec40843813d3e1c200f7b27f0e099b426ef9b59e0c15cb5453ac166e8a566b24178b95836776207de0bf19f5e021fdccfbca
SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918
SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1
SHA512 (postgresql-17devel.tar.bz2) = c33b82561f55b74c37c921a668f5b548555d5abc5caf67a365541aa0e31572e1bcfa0ccdaceb8807a84ccefb547e846092ac0e94bc49af2bcfbe2b7a88b02c57
SHA512 (postgresql-17devel.tar.bz2.sha256) = 7f875a02e2673a9e3e86fd6bf61707144484eaad2d9f1d6e141091af67113f99214d19db1e347676e17501a0bb254b9ddd315e4cd5e3ea697e59c1e0905733cc
SHA512 (postgresql-setup-8.9.tar.gz) = 118e9ebf858722a38b0e90324bc1b49fc7058cda601ca0a7e78c94e7b95e89d6dbbc46f377626364b068614ced3cde3cb4733973ad2d71bf17892ad773657ef7