diff --git a/.cvsignore b/.cvsignore index 9dda70d..4f063bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pgpool-II-1.2.tar.gz +pgpool-II-2.1.tar.gz diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 diff --git a/pgpool.conf.sample.patch b/pgpool.conf.sample.patch new file mode 100644 index 0000000..adc6dee --- /dev/null +++ b/pgpool.conf.sample.patch @@ -0,0 +1,33 @@ +--- pgpool.conf.sample.old 2008-08-12 08:26:07.000000000 +0300 ++++ pgpool.conf.sample 2008-08-12 08:27:31.000000000 +0300 +@@ -12,16 +12,14 @@ + # Port number for pgpool communication manager + pcp_port = 9898 + +-# Unix domain socket path. (The Debian package defaults to +-# /var/run/postgresql.) +-socket_dir = '/tmp' ++# Unix domain socket path. ++socket_dir = '/var/run' + + # Unix domain socket path for pgpool communication manager. +-# (Debian package defaults to /var/run/postgresql) +-pcp_socket_dir = '/tmp' ++pcp_socket_dir = '/var/run' + +-# Unix domain socket path for the backend. Debian package defaults to /var/run/postgresql! +-backend_socket_dir = '/tmp' ++# Unix domain socket path for the backend. ++backend_socket_dir = '/var/run' + + # pgpool communication manager timeout. 0 means no timeout, but strongly not recommended! + pcp_timeout = 10 +@@ -54,7 +52,7 @@ + authentication_timeout = 60 + + # Logging directory +-logdir = '/tmp' ++logdir = '/var/run' + + # Replication mode + replication_mode = false diff --git a/pgpool.init b/pgpool.init index 8c96220..89aa399 100755 --- a/pgpool.init +++ b/pgpool.init @@ -8,11 +8,12 @@ # # v1.0.0 Devrim GUNDUZ # - Initial version of Red Hat / Fedora init script - -if [ -r /etc/sysconfig/pgpool ]; then - . /etc/sysconfig/pgpool -fi - +# v1.0.1 Devrim GUNDUZ +# - - Honor /etc/sysconfig/pgpool settings. Previously we could never +# customize PGPOOLPID=/var/run/pgpool.pid et al. +# - Remaining hardcoded paths replaced by customizable variables +# such as $PGPOOLCONF . + # Source function library. INITD=/etc/rc.d/init.d . $INITD/functions @@ -37,16 +38,21 @@ PGPOOLCONF=/etc/pgpool.conf PGPOOLPID=/var/run/pgpool.pid PGPOOLLOG=/var/log/pgpool.log +# read in the site custom setup +if [ -r /etc/sysconfig/pgpool ]; then + . /etc/sysconfig/pgpool +fi + test -x $PGPOOLDAEMON || exit 5 -# Create the log file if it does not exist +# Create the pgpool.log log file if it does not exist if [ ! -r $PGPOOLLOG ] then touch $PGPOOLLOG fi -# Check whether the config file exists or not -if [ ! -r /etc/pgpool.conf ] +# Check whether the pgpool.conf config file exists or not +if [ ! -r "$PGPOOLCONF" ] then echo "$PGPOOLCONF not found" RETVAL=1 @@ -82,7 +88,7 @@ stop(){ RETVAL=1 failure else - killproc /usr/bin/pgpool + killproc $PGPOOLDAEMON RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${NAME} fi; diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 81a10a4..64fafc4 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -2,14 +2,15 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 1.2 -Release: 2%{?dist} +Version: 2.1 +Release: 1%{?dist} License: BSD Group: Applications/Databases URL: http://pgpool.projects.PostgreSQL.org/pgpool-II/en -Source0: http://pgfoundry.org/frs/download.php/1419/%{short_name}-%{version}.tar.gz +Source0: http://pgfoundry.org/frs/download.php/1843/%{short_name}-%{version}.tar.gz Source1: pgpool.init Source2: pgpool.sysconfig +Patch1: pgpool.conf.sample.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel pam-devel @@ -36,13 +37,14 @@ 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: %{name} = %{version}-%{release} %description devel Development headers and libraries for pgpool-II. %prep %setup -q -n %{short_name}-%{version} +%patch1 -p0 %build %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath @@ -52,11 +54,12 @@ make %{?_smp_flags} %install rm -rf %{buildroot} make %{?_smp_flags} DESTDIR=%{buildroot} install +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 -install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/pgpool +install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/pgpool # nuke libtool archive and static lib rm -f %{buildroot}%{_libdir}/libpcp.{a,la} @@ -64,7 +67,10 @@ rm -f %{buildroot}%{_libdir}/libpcp.{a,la} %clean rm -rf %{buildroot} -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +chkconfig --add pgpool + %postun -p /sbin/ldconfig %files @@ -77,13 +83,14 @@ rm -rf %{buildroot} %{_bindir}/pcp_node_info %{_bindir}/pcp_proc_count %{_bindir}/pcp_proc_info +%{_bindir}/pcp_recovery_node %{_bindir}/pcp_stop_pgpool %{_bindir}/pcp_systemdb_info %{_bindir}/pg_md5 %{_mandir}/man8/pgpool* %{_datadir}/%{short_name}/system_db.sql %{_libdir}/libpcp.so.* -%attr(764,root,apache) %{_datadir}/%{short_name}/*.conf.sample +%attr(764,root,root) %{_datadir}/%{short_name}/*.conf.sample %{_datadir}/%{short_name}/pgpool.pam %{_initrddir}/pgpool %config(noreplace) %{_sysconfdir}/sysconfig/pgpool @@ -95,6 +102,47 @@ rm -rf %{buildroot} %{_libdir}/libpcp.so %changelog +* Tue Aug 12 2008 Devrim Gunduz 2.1-1 +- Update to 2.1 Gold +- Set group of sample config files to root, not apache. Fixes RH #442372. +- Update patch #1 + +* Fri Apr 11 2008 Devrim Gunduz 2.1-0.2.beta2 +- Fix Requires: issue, per #442021 (Alex Lancaster) + +* Sun Apr 6 2008 Devrim Gunduz 2.1-beta2 +- Update to 2.1 beta2 + +* Mon Feb 18 2008 Fedora Release Engineering - 2.0.1-3.1 +- Autorebuild for GCC 4.3 + +* Mon Jan 21 2008 Devrim GUNDUZ 2.0.1-2.1 +- Rebuilt against PostgreSQL 8.3 + +* Sat Jan 19 2008 Devrim Gunduz 2.0.1-2 +- Fix Requires of -devel package, per bz#429436 + +* 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 + +* Fri Oct 5 2007 Devrim Gunduz 1.2.1-1 +- Update to 1.2.1 + +* Wed Aug 29 2007 Devrim Gunduz 1.2-5 +- Chmod sysconfig/pgpool to 644, not 755. Per BZ review. +- Run chkconfig --add pgpool during %%post. + +* Thu Aug 16 2007 Devrim Gunduz 1.2-4 +- Fixed the directory name where sample conf files and sql files + are installed. + +* Sun Aug 5 2007 Devrim Gunduz 1.2-3 +- Added a patch for sample conf file to use Fedora defaults + * Sun Aug 5 2007 Devrim Gunduz 1.2-2 - Added an init script for pgpool - Added /etc/sysconfig/pgpool diff --git a/sources b/sources index f0d00ef..64b0bb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fed94ed12769dacbbf8758b2154e5a7 pgpool-II-1.2.tar.gz +cf02f9358f46849bd526798868e13162 pgpool-II-2.1.tar.gz