From a3c41cd6d07191f3f58b59b707bfd21bb7283ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=9CND=C3=9CZ?= Date: Mon, 14 Jan 2008 08:24:24 +0000 Subject: [PATCH] Update to 2.0.1 Add a temp patch that will disappear in 2.0.2 --- pool_process_query-2.0.1.patch | 27 +++++++++++++++++++++++++++ postgresql-pgpool-II.spec | 21 +++++++++++---------- 2 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 pool_process_query-2.0.1.patch diff --git a/pool_process_query-2.0.1.patch b/pool_process_query-2.0.1.patch new file mode 100644 index 0000000..b6e3bb5 --- /dev/null +++ b/pool_process_query-2.0.1.patch @@ -0,0 +1,27 @@ +*** pool_process_query.c 2007/11/21 09:37:39 1.79 +--- pool_process_query.c.old 2007/12/01 13:26:36 1.80 +*************** +*** 1,6 **** + /* -*-pgsql-c-*- */ + /* +! * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/F-11/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $ + * + * pgpool: a language independent connection pool server for PostgreSQL + * written by Tatsuo Ishii +--- 1,6 ---- + /* -*-pgsql-c-*- */ + /* +! * $Header: /home/fedora/jkeating/pkgs/rpms/postgresql-pgpool-II/F-11/Attic/pool_process_query-2.0.1.patch,v 1.1 2008/01/14 08:24:24 devrim Exp $ + * + * pgpool: a language independent connection pool server for PostgreSQL + * written by Tatsuo Ishii +*************** POOL_STATUS SimpleForwardToBackend(char +*** 3895,3901 **** + + if (kind == 'S') /* Sync message? */ + { +- pool_log("YYYYY"); + receive_sync = 1; + } + +--- 3895,3900 ---- diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index c2ea3e9..09af754 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -11,6 +11,7 @@ Source0: http://pgfoundry.org/frs/download.php/1521/%{short_name}-%{version}.tar Source1: pgpool.init Source2: pgpool.sysconfig Patch1: pgpool.conf.sample.patch +Patch4: pool_process_query-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel pam-devel @@ -37,7 +38,7 @@ 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} = %{version} +Requires: %{short_name} = %{version} %description devel Development headers and libraries for pgpool-II. @@ -45,6 +46,7 @@ Development headers and libraries for pgpool-II. %prep %setup -q -n %{short_name}-%{version} %patch1 -p0 +%patch4 -p0 %build %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath @@ -54,10 +56,8 @@ make %{?_smp_flags} %install rm -rf %{buildroot} make %{?_smp_flags} DESTDIR=%{buildroot} install -install -d %{buildroot}%{_datadir}/%{name} -mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{name} -mv %{buildroot}%{_datadir}/%{short_name}/system_db.sql %{buildroot}%{_datadir}/%{name} -mv %{buildroot}%{_datadir}/%{short_name}/pgpool.pam %{buildroot}%{_datadir}/%{name} +install -d %{buildroot}%{_datadir}/%{short_name} +mv %{buildroot}/%{_sysconfdir}/*.conf.sample %{buildroot}%{_datadir}/%{short_name} install -d %{buildroot}%{_initrddir} install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool install -d %{buildroot}%{_sysconfdir}/sysconfig @@ -85,15 +85,15 @@ chkconfig --add pgpool %{_bindir}/pcp_node_info %{_bindir}/pcp_proc_count %{_bindir}/pcp_proc_info -%{_bindir}/pcp_recovery_node %{_bindir}/pcp_stop_pgpool +%{_bindir}/pcp_recovery_node %{_bindir}/pcp_systemdb_info %{_bindir}/pg_md5 %{_mandir}/man8/pgpool* -%{_datadir}/%{name}/system_db.sql +%{_datadir}/%{short_name}/system_db.sql %{_libdir}/libpcp.so.* -%attr(764,root,apache) %{_datadir}/%{name}/*.conf.sample -%{_datadir}/%{name}/pgpool.pam +%attr(764,root,apache) %{_datadir}/%{short_name}/*.conf.sample +%{_datadir}/%{short_name}/pgpool.pam %{_initrddir}/pgpool %config(noreplace) %{_sysconfdir}/sysconfig/pgpool @@ -104,8 +104,9 @@ chkconfig --add pgpool %{_libdir}/libpcp.so %changelog -* Sat Jan 5 2008 Devrim Gunduz 2.0.1-1 +* Sun Jan 13 2008 Devrim Gunduz 2.0.1-1 - Update to 2.0.1 +- Add a temp patch that will disappear in 2.0.2 * Tue Oct 23 2007 Devrim Gunduz 1.3-1 - Update to 1.3