diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 0e6c01e..cd77114 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ -/pgpool-II-*.tar.gz +/pgpool-II-3.4.1.tar.gz +/pgpool-II-3.4.2.tar.gz +/pgpool-II-3.4.3.tar.gz +/pgpool-II-3.5.0.tar.gz +/pgpool-II-3.5.1.tar.gz +/pgpool-II-3.5.2.tar.gz diff --git a/pgpool.init b/pgpool.init index 56e0f0a..f09b982 100644 --- a/pgpool.init +++ b/pgpool.init @@ -4,7 +4,7 @@ # chkconfig: - 64 36 # description: Starts and stops the pgpool daemon # processname: pgpool -# pidfile: /run/pgpool.pid +# pidfile: /var/run/pgpool.pid # # v1.0.0 Devrim GUNDUZ # - Initial version of Red Hat / Fedora init script @@ -52,7 +52,7 @@ fi PGPOOLENGINE=/usr/bin PGPOOLDAEMON=$PGPOOLENGINE/pgpool PGPOOLCONF=/etc/pgpool-II/pgpool.conf -PGPOOLPIDDIR=/run/pgpool +PGPOOLPIDDIR=/var/run/pgpool PGPOOLLOG=/var/log/pgpool.log test -x $PGPOOLDAEMON || exit 5 diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index e4142db..473b3b2 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -5,34 +5,22 @@ %global systemd_enabled 1 %endif -%global _varrundir %{_rundir}/pgpool +%global _varrundir %{_localstatedir}/run/pgpool Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 4.5.1 -Release: 6%{?dist} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD - +Version: 3.5.2 +Release: 1%{?dist} +License: BSD +Group: Applications/Databases URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz Source1: pgpool.service Source2: pgpool.sysconfig Source3: pgpool.init - -# Stop building i686 architecture -ExcludeArch: %{ix86} - -BuildRequires: make -BuildRequires: gcc -BuildRequires: clang-devel llvm-devel -BuildRequires: postgresql-server-devel -BuildRequires: pam-devel, libmemcached-awesome-devel, openssl-devel -BuildRequires: libxcrypt-devel - +BuildRequires: postgresql-devel, pam-devel, libmemcached-devel, openssl-devel %if %{systemd_enabled} BuildRequires: systemd - # We require this to be present for %%{_prefix}/lib/tmpfiles.d Requires: systemd Requires(post): systemd-sysv @@ -69,23 +57,20 @@ DB nodes to be connected, which was not possible in pgpool-I. %package devel Summary: The development files for pgpool-II +Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -# Stop building i686 architecture -ExcludeArch: %{ix86} - %description devel Development headers and libraries for pgpool-II. %package extensions Summary: Postgresql extensions for pgpool-II +Group: Applications/Databases Obsoletes: postgresql-pgpool-II-recovery <= 3.3.4-1 Provides: postgresql-pgpool-II-recovery = %{version}-%{release} -Requires: postgresql-server +Requires: postgresql-server(:MODULE_COMPAT_%{postgresql_major}) Requires: %{name}%{?_isa} = %{version}-%{release} -# Stop building i686 architecture -ExcludeArch: %{ix86} %description extensions Postgresql extensions libraries and sql files for pgpool-II. @@ -107,25 +92,23 @@ Postgresql extensions libraries and sql files for pgpool-II. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -# GCC 10 defaults to -fno-common which -# https://gcc.gnu.org/gcc-10/changes.html (see C section) -%make_build CFLAGS="%{optflags} -fcommon" -%make_build CFLAGS="%{optflags} -fcommon" -C src/sql/pgpool-recovery -%make_build CFLAGS="%{optflags} -fcommon" -C src/sql/pgpool-regclass +make %{?_smp_mflags} +make %{?_smp_mflags} -C src/sql/pgpool-recovery +make %{?_smp_mflags} -C src/sql/pgpool-regclass %install -%make_install -%make_install -C src/sql/pgpool-recovery -%make_install -C src/sql/pgpool-regclass +make %{?_smp_mflags} DESTDIR=%{buildroot} install +make %{?_smp_mflags} DESTDIR=%{buildroot} install -C src/sql/pgpool-recovery +make %{?_smp_mflags} DESTDIR=%{buildroot} install -C src/sql/pgpool-regclass install -d %{buildroot}%{_datadir}/%{short_name} install -d %{buildroot}%{_sysconfdir}/%{short_name} mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool.conf mv %{buildroot}/%{_sysconfdir}/%{short_name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pool_hba.conf -mv %{buildroot}/%{_sysconfdir}/%{short_name}/failover.sh.sample %{buildroot}%{_sysconfdir}/%{short_name}/failover.sh -mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool_remote_start.sample %{buildroot}%{_sysconfdir}/%{short_name}/pgpool_remote_start -mv %{buildroot}/%{_sysconfdir}/%{short_name}/recovery_1st_stage.sample %{buildroot}%{_sysconfdir}/%{short_name}/recovery_1st_stage +mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-master-slave %{buildroot}%{_datadir}/%{short_name}/ +mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/ +mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-stream %{buildroot}%{_datadir}/%{short_name}/ %if %{systemd_enabled} install -d %{buildroot}%{_unitdir} @@ -156,7 +139,7 @@ rm -f %{buildroot}%{_libdir}/libpcp.{a,la} # This adds the proper /etc/rc*.d links for the script /sbin/chkconfig --add pgpool %endif -%tmpfiles_create %{_tmpfilesdir}/%{name}.conf +%tmpfiles_create %preun %if %{systemd_enabled} @@ -168,7 +151,7 @@ if [ $1 -eq 0 ] ; then fi %endif -%postun +%postun /sbin/ldconfig %if %{systemd_enabled} %systemd_postun_with_restart pgpool.service @@ -191,12 +174,8 @@ fi %endif %files -%doc README TODO COPYING AUTHORS ChangeLog NEWS -%{_bindir}/pg_enc +%doc README TODO COPYING AUTHORS ChangeLog NEWS doc/pgpool-en.html doc/pgpool-ja.html doc/pgpool.css doc/tutorial-en.html doc/tutorial-ja.html %{_bindir}/pgpool -%{_bindir}/pgpool_setup -%{_bindir}/pgproto -%{_bindir}/watchdog_setup %{_bindir}/pcp_attach_node %{_bindir}/pcp_detach_node %{_bindir}/pcp_node_count @@ -208,12 +187,13 @@ fi %{_bindir}/pcp_recovery_node %{_bindir}/pcp_stop_pgpool %{_bindir}/pcp_watchdog_info -%{_bindir}/pcp_health_check_stats -%{_bindir}/pcp_reload_config -%{_bindir}/wd_cli %{_bindir}/pg_md5 +%{_mandir}/man8/pgpool* %dir %{_datadir}/%{short_name} %{_datadir}/%{short_name}/insert_lock.sql +%{_datadir}/%{short_name}/pgpool.conf.sample-master-slave +%{_datadir}/%{short_name}/pgpool.conf.sample-replication +%{_datadir}/%{short_name}/pgpool.conf.sample-stream %{_libdir}/libpcp.so.* %{_datadir}/%{short_name}/pgpool.pam %if %{systemd_enabled} @@ -224,7 +204,7 @@ fi %{_sysconfdir}/init.d/pgpool %endif %dir %{_sysconfdir}/%{short_name} -%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/* +%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf %config(noreplace) %{_sysconfdir}/sysconfig/pgpool %files devel @@ -238,12 +218,6 @@ fi %{_libdir}/pgsql/pgpool-recovery.so %{_datadir}/pgsql/extension/pgpool-recovery.sql %{_datadir}/pgsql/extension/pgpool_recovery--1.1.sql -%{_datadir}/pgsql/extension/pgpool_recovery--1.2.sql -%{_datadir}/pgsql/extension/pgpool_recovery--1.3.sql -%{_datadir}/pgsql/extension/pgpool_recovery--1.4.sql -%{_datadir}/pgsql/extension/pgpool_recovery--1.1--1.2.sql -%{_datadir}/pgsql/extension/pgpool_recovery--1.2--1.3.sql -%{_datadir}/pgsql/extension/pgpool_recovery--1.3--1.4.sql %{_datadir}/pgsql/extension/pgpool_recovery.control %{_datadir}/pgsql/extension/pgpool-regclass.sql %{_datadir}/pgsql/extension/pgpool_regclass--1.0.sql @@ -254,241 +228,12 @@ fi %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 4.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Feb 01 2025 Björn Esser - 4.5.1-5 -- Add explicit BR: libxcrypt-devel - -* Sat Jan 18 2025 Fedora Release Engineering - 4.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 4.5.1-3 -- convert license to SPDX - -* Fri Jul 19 2024 Fedora Release Engineering - 4.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Feb 29 2024 Ondrej Sloup - 4.5.1-1 -- Rebase to the latest upstream version (rhbz#2266774) - -* Tue Jan 30 2024 Ondrej Sloup - 4.5.0-3 -- Stop building i686 permanently -- https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval - -* Fri Jan 26 2024 Ondrej Sloup - 4.5.0-2 -- Temporarily stop building i686 - -* Fri Jan 26 2024 Ondrej Sloup - 4.5.0-1 -- Rebase to the latest upstream version (rhbz#2252211) - -* Thu Jan 25 2024 Fedora Release Engineering - 4.4.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 4.4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Dec 05 2023 Filip Janus - 4.4.5-1 -- Update to 4.4.5 - -* Tue Dec 05 2023 Filip Janus - 4.4.4-2 -- Rebuild for demodularized version of postgresql -- remove postgresq-_module_compat since it is not working with demodularized packages - -* Tue Aug 22 2023 Ondrej Sloup - 4.4.4-1 -- Rebase to the latest upstream version (rhbz#2232454) - -* Fri Jul 21 2023 Fedora Release Engineering - 4.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jun 02 2023 Ondrej Sloup - 4.4.3-1 -- Rebase to the latest upstream version (rhbz#2208166) - -* Fri Jan 27 2023 Ondrej Sloup - 4.4.2-1 -- Rebase to the latest upstream version (rhbz#2163118) - -* Fri Jan 20 2023 Fedora Release Engineering - 4.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Dec 23 2022 Ondrej Sloup - 4.4.1-1 -- Rebase to the latest upstream version (rhbz#2155852) - -* Tue Dec 06 2022 Ondrej Sloup - 4.4.0-1 -- Rebase to the latest upstream version (rhbz#1930321) - -* Wed Nov 16 2022 Ondřej Sloup - 4.3.3-2 -- Rebuild for new PostgreSQL 15 - -* Tue Aug 23 2022 Ondrej Sloup - 4.3.3-1 -- Rebase to the latest upstream version (rhbz#2119261ZZ) - -* Thu Jun 30 2022 Ondrej Sloup - 4.3.2-2 -- Fix the legacy directory /var/run/ (rhbz#2102041) - -* Thu May 19 2022 Ondrej Sloup - 4.3.2-1 -- Rebase to the latest upstream version (rhbz#2088219) - -* Thu May 05 2022 Ondrej Sloup - 4.3.1-1 -- Fix mixed spaces and tabs -- Remove config files as they were unified -- Fix chronology of changelog made by Mass_Rebuild -- Add pgpool_recovery 1.4 and 1.3-1.4 -- Rebase to the latest upstream version (rhbz#1870431) - -* Fri Jan 21 2022 Fedora Release Engineering - 4.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jan 06 2022 Filip Januš - 4.2.0-6 -- Rebuild for Postgresql 14 - -* Tue Sep 14 2021 Sahana Prasad - 4.2.0-5 -- Rebuilt with OpenSSL 3.0.0 - -* Tue Jul 27 2021 Filip Januš - 4.2.0-4 -- Remove libpq-devel requirement, it conflicts with postgresql-server-devel - dependencies - -* Fri Jul 23 2021 Fedora Release Engineering - 4.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 4.2.0-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Jan 13 2021 Patrik Novotný - 4.2.0-1 -- Rebase to upstream release 4.2.0 - -* Tue Jan 12 2021 Fedora Release Engineering - 4.1.2-3 -- This record was edited on May 06 2022, to change the date from Jan 27 to Jan 12 to preserve chronology -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 4.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 01 2020 Ondrej Dubaj - 4.1.2-1 -- Rebase to upstream release version 4.1.2 - -* Sun Mar 08 2020 Patrik Novotný - 4.1.1-1 -- Rebase to upstream release version 4.1.1 - -* Thu Jan 30 2020 Fedora Release Engineering - 4.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 4.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jul 12 2019 Petr Kubat - 4.0.3-2 -- Fix build failure due to missing tmpfiles_create arguments - -* Thu Feb 21 2019 Jozef Mlich - 4.0.3-1 -- update to the latest version, per release notes: - http://www.pgpool.net/docs/latest/en/html/release-4-0-3.html - -* Sat Feb 02 2019 Fedora Release Engineering - 4.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 23 2019 Pavel Raiskup - 4.0.2-1 -- update to the latest version, per release notes: - http://www.pgpool.net/docs/latest/en/html/release-4-0-2.html - http://www.pgpool.net/docs/latest/en/html/release-3-7-5.html - -* Mon Jan 14 2019 Björn Esser - 3.7.4-5 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Thu Oct 18 2018 Petr Kubat - 3.7.5-4 -- rebuild for PostgreSQL 11 - -* Wed Sep 05 2018 Pavel Raiskup - 3.7.4-3 -- rebuild against postgresql-server-devel (rhbz#1618698) - -* Fri Jul 13 2018 Fedora Release Engineering - 3.7.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 12 2018 Jozef Mlich - 3.7.4-1 -- update to 3.7.4, per release notes: - http://www.pgpool.net/docs/latest/en/html/release-3-7-4.html - -* Tue Apr 17 2018 Jozef Mlich - 3.7.3-1 -- update to 3.7.3, per release notes: - http://www.pgpool.net/docs/latest/en/html/release-3-7-3.html - -* Fri Feb 09 2018 Fedora Release Engineering - 3.7.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 3.7.1-2 -- Rebuilt for switch to libxcrypt - -* Tue Jan 09 2018 Jozef Mlich - 3.7.1-1 -- update to 3.7.1, per release notes: - http://www.pgpool.net/docs/latest/en/html/release-3-7-1.html - -* Wed Nov 22 2017 Jozef Mlich - 3.7.0-1 -- update to 3.7.0, per release notes: - http://www.pgpool.net/docs/latest/en/html/release-3-7.html - -* Wed Nov 08 2017 Pavel Raiskup - 3.6.7-1 -- update to 3.6.7, per release notes: - http://www.pgpool.net/docs/latest/en/html/release-3-6-7.html - -* Tue Oct 10 2017 Pavel Raiskup - 3.6.5-4 -- rebuild for PostgreSQL 10 - -* Thu Aug 03 2017 Fedora Release Engineering - 3.6.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.6.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jul 11 2017 Jozef Mlich - 3.6.5-1 -- rebuild for pgpool 3.6.5 - see http://www.pgpool.net/docs/pgpool-II-3.6.5/doc/en/html/release-3-6-5.html - -* Thu May 11 2017 Jozef Mlich - 3.6.4-1 -- rebuild for pgpool 3.6.4 - -* Fri Apr 28 2017 Jozef Mlich - 3.6.3-1 -- rebuild for pgpool 3.6.3 - -* Fri Mar 17 2017 Jozef Mlich - 3.6.2-1 -- rebuild for pgpool 3.6.2 - -* Sat Feb 11 2017 Fedora Release Engineering - 3.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 26 2016 Jozef Mlich - 3.6.1-1 -- rebuild for pgpool 3.6.1 - -* Mon Nov 21 2016 Jozef Mlich - 3.6.0-1 -- rebuild for pgpool 3.6.0 - Improve the behavior of fail-over. - New PGPOOL SET command has been introduced. - Watchdog is significantly enhanced. - Handling of extended query protocol (e.g. used by Java applications) in streaming replication mode speeds up if many rows are returned in a result set. - Import parser of PostgreSQL 9.6. - In some cases pg_terminate_backend() now does not trigger a fail-over. - Change documentation format from raw HTML to SGML. - -* Mon Oct 10 2016 Pavel Raiskup - 3.5.4-3 -- bump: build in rawhide done too early - -* Mon Oct 10 2016 Petr Kubat - 3.5.4-2 -- Rebuild for PostgreSQL 9.6.0 - -* Wed Aug 31 2016 Jozef Mlich - 3.5.4-1 -- rebuild for pgpool 3.5.4 - see http://www.pgpool.net/docs/pgpool-II-3.5.4/NEWS.txt - -* Fri Jun 17 2016 Jozef Mlich - 3.5.3-1 -- rebuild for pgpool 3.5.3 - see http://www.pgpool.net/docs/pgpool-II-3.5.3/NEWS.txt - -* Tue Apr 26 2016 Jozef Mlich - 3.5.2-1 -- rebuld for pgpool 3.5.2 - see http://www.pgpool.net/docs/pgpool-II-3.5.2/NEWS.txt +* Tue May 3 2016 Devrim Gündüz - 3.5.2-1 +- Update to 3.5.2 * Mon Apr 04 2016 Jozef Mlich - 3.5.1-1 -- rebuld for pgool 3.5.1 - see http://www.pgpool.net/docs/pgpool-II-3.5.1/NEWS.txt +- rebuld for pgpool 3.5.1 + See http://pgpool.net/mediawiki/index.php?title=pgpool-II_3.5_features&redirect=no * Thu Feb 04 2016 Fedora Release Engineering - 3.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -507,7 +252,7 @@ fi * Fri Jul 24 2015 Jozef Mlich - 3.4.3-1 - Update to 3.4.3 - see http://www.pgpool.net/docs/pgpool-II-3.4.3/NEWS.txt + see http://www.pgpool.net/docs/pgpool-II-3.4.2/NEWS.txt * Thu Jun 18 2015 Fedora Release Engineering - 3.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources old mode 100755 new mode 100644 index 7af30b9..5b9890a --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pgpool-II-4.5.1.tar.gz) = 790278ca64303b924aeecfca6e78d934c6c8d48f1a705f3cf5d648ea79893f1749b10fd9d8575e5ae7f89997d0b311d0e5e7c02da771a0b37060bf12b4590d5f +f9b50b4ca2db6ea13263be28ee4151b4 pgpool-II-3.5.2.tar.gz