rpms/pgbouncer/devel import.log, NONE, 1.1 pgbouncer-ini.patch, NONE, 1.1 pgbouncer.init, NONE, 1.1 pgbouncer.spec, NONE, 1.1 pgbouncer.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Devrim GÜNDÜZ devrim at fedoraproject.org
Sun Aug 31 10:49:35 UTC 2008


Author: devrim

Update of /cvs/extras/rpms/pgbouncer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28317/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pgbouncer-ini.patch pgbouncer.init pgbouncer.spec 
	pgbouncer.sysconfig 
Log Message:
Initial import of pgbouncer.



--- NEW FILE import.log ---
pgbouncer-1_2_3-3_f9:HEAD:pgbouncer-1.2.3-3.f9.src.rpm:1220179754

pgbouncer-ini.patch:

--- NEW FILE pgbouncer-ini.patch ---
--- etc/pgbouncer.ini.old	2008-03-07 15:04:43.000000000 -0800
+++ etc/pgbouncer.ini	2008-03-07 15:37:18.000000000 -0800
@@ -17,8 +17,8 @@
 ;;; Administrative settings
 ;;;
 
-logfile = pgbouncer.log
-pidfile = pgbouncer.pid
+logfile = /var/log/pgbouncer.log
+pidfile = /var/run/pgbouncer/pgbouncer.pid
 
 ;;;
 ;;; Where to wait for clients
@@ -26,7 +26,7 @@
 
 ; ip address or * which means all ip-s
 listen_addr = 127.0.0.1
-listen_port = 6000
+listen_port = 5450
 unix_socket_dir = /tmp
 
 ;;;
@@ -35,15 +35,15 @@
 
 ; any, trust, plain, crypt, md5
 auth_type = trust
-#auth_file = 8.0/main/global/pg_auth
-auth_file = etc/userlist.txt
+auth_file = /var/lib/pgsql/data/global/pg_auth
+#auth_file = etc/userlist.txt
 
 ;;;
 ;;; Users allowed into database 'pgbouncer'
 ;;;
 
 ; comma-separated list of users, who are allowed to change settings
-admin_users = user2, someadmin, otheradmin
+admin_users = postgres
 
 ; comma-separated list of users who are just allowed to use SHOW command
 stats_users = stats, root


--- NEW FILE pgbouncer.init ---
#!/bin/sh
# postgresql    This is the init script for starting up the pgbouncer
#
# chkconfig: - 64 36
# description: Starts and stops the pgbouncer daemon.
#
# processname: pgbouncer
# pidfile: /var/run/pgbouncer/pgbouncer.pid

# Source function library.
INITD=/etc/rc.d/init.d
. $INITD/functions

# Get function listing for cross-distribution logic.
TYPESET=`typeset -f|grep "declare"`

# Get config.
. /etc/sysconfig/network

# Find the name of the script
NAME=`basename $0`
if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]
then
	NAME=${NAME:3}
fi

# For SELinux we need to use 'runuser' not 'su'
if [ -x /sbin/runuser ]
then
    SU=runuser
else
    SU=su
fi

# Override defaults from /etc/sysconfig/pgbouncer if file is present
[ -f /etc/sysconfig/${NAME} ] && . /etc/sysconfig/${NAME}

# Check that networking is up.
[ "${NETWORKING}" = "no" ] && exit 0

script_result=0

start(){
	BOUNCER_START=$"Starting ${NAME} service: "

	# Make sure startup-time log file is valid
	if [ ! -e "$BOUNCERLOG" -a ! -h "$BOUNCERLOG" ]
	then
		touch "$BOUNCERLOG" || exit 1
		chown postgres:postgres "$BOUNCERLOG"
		chmod go-rwx "$BOUNCERLOG"
		[ -x /usr/bin/chcon ] && /usr/bin/chcon -u system_u -r object_r -t postgresql_log_t "$BOUNCERLOG" 2>/dev/null
	fi

	# Make sure that pgbouncer is not already running:	
	if [ -f /var/run/${NAME}/${NAME}.pid ]
	then
		echo "${NAME} is already running"
		echo_failure
		echo
		exit 1
	fi

	echo -n "$BOUNCER_START"
	[ -d /var/run/${NAME} ] || mkdir /var/run/${NAME}
	chown postgres: /var/run/${NAME}

	$SU -l postgres -c "pgbouncer '$BOUNCERCONF' & " >> "$BOUNCERLOG" 2>&1 < /dev/null
	sleep 2
	pid=`pidof -s pgbouncer`
        if [ $pid ]
        then
          success "$BOUNCER_START"
          touch /var/lock/subsys/${NAME}
          echo "$pid" > "/var/run/${NAME}/${NAME}.pid"
          echo
        else
          failure "$BOUNCER_START"
          echo
          script_result=1
        fi
}

stop(){
        echo -n $"Stopping ${NAME} service: "
	if [ -f /var/run/${NAME}/${NAME}.pid ]
	then
	        kill -TERM `cat "/var/run/${NAME}/${NAME}.pid"`
	        ret=$? 
	        if [ $ret -eq 0 ]
	        then
	                echo_success
	        else
	                echo_failure
	                script_result=1
	        fi
	        echo
	          rm -f "/var/run/${NAME}/${NAME}.pid"
	          rm -f "/var/lock/subsys/${NAME}"
	else
		echo "   ${NAME} is not running."
		echo_failure
		echo
		exit 1
	fi
}

restart(){
    stop
    start
}

condrestart(){
    [ -e /var/lock/subsys/${NAME} ] && restart
}

condstop(){
    [ -e /var/lock/subsys/${NAME} ] && stop
}

reload(){
    $SU -l postgres -c "kill -HUP `cat /var/run/${NAME}/${NAME}.pid`" > /dev/null 2>&1 < /dev/null
}
pause(){
    $SU -l postgres -c "kill -USR1 `cat /var/run/${NAME}/${NAME}.pid`" > /dev/null 2>&1 < /dev/null
}
resum(){
   $SU -l postgres -c "kill -USR2 `cat /var/run/${NAME}/${NAME}.pid`" > /dev/null 2>&1 < /dev/null
}
# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status pgbouncer 
	script_result=$?
	;;
  restart)
	restart
	;;
  pause)
	pause
	;;
  continue)
	resum
	;;
  condrestart)
	condrestart
	;;
  condstop)
	condstop
	;;
  reload|force-reload)
	reload
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|pause|continue|reload|force-reload|condrestart|condstop}"
	exit 1
esac

exit $script_result


--- NEW FILE pgbouncer.spec ---
%define debug 0

Name:		pgbouncer
Version:	1.2.3
Release:	3%{?dist}
Summary:	Lightweight connection pooler for PostgreSQL
Group:		Applications/Databases
License:	MIT and BSD
URL:		http://pgfoundry.org/projects/pgbouncer/
Source0:	http://pgfoundry.org/frs/download.php/1873/%{name}-%{version}.tgz
Source1:	%{name}.init
Source2:	%{name}.sysconfig
Patch0:		%{name}-ini.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libevent-devel >= 1.3b
Requires:	initscripts

Requires(post):	chkconfig
Requires(preun):	chkconfig, initscripts
Requires(postun):	initscripts

%description
pgbouncer is a lightweight connection pooler for PostgreSQL.
pgbouncer uses libevent for low-level socket handling.

%prep
%setup -q -n %{name}-%{version}
%patch0 -p0

%build
sed -i.fedora \
 -e 's|-fomit-frame-pointer||' \
 -e '/BININSTALL/s|-s||' \
 configure

%configure \
%if %debug
	--enable-debug \
	--enable-cassert \
%endif
--datadir=%{_datadir} 

make %{?_smp_mflags} V=1

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -p -d %{buildroot}%{_sysconfdir}/
install -p -d %{buildroot}%{_sysconfdir}/sysconfig
install -p -m 644 etc/pgbouncer.ini %{buildroot}%{_sysconfdir}/
rm -f %{buildroot}%{_docdir}/%{name}/pgbouncer.ini
install -p -d %{buildroot}%{_initrddir}
install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}

%post
chkconfig --add pgbouncer

%preun
if [ $1 = 0 ] ; then
	/sbin/service pgbouncer condstop >/dev/null 2>&1
	chkconfig --del pgbouncer
fi

%postun
if [ "$1" -ge "1" ] ; then
	/sbin/service pgbouncer condrestart >/dev/null 2>&1 || :
fi

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README NEWS AUTHORS
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/%{name}.ini
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_mandir}/man1/%{name}.*
%{_mandir}/man5/%{name}.*

%changelog
* Fri Aug 29 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.3-3
- More fixes, per Fedora review.

* Fri Aug 29 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.3-2
- More fixes, per Fedora review.

* Fri Aug 8 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.2.3-1
- Update to 1.2.3
- Final fixes for Fedora review

* Sun Mar 23 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.1.2-3
- Mark sysconfig file as config file, per Guillaume Smet.

* Fri Mar 7 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.1.2-2
- Add a patch for pgbouncer.ini to satisfy Red Hat defaults and security.
  Per Darcy Buskermolen.
- Fix chkconfig line
- Add sysconfig file
- Refactor init script

* Sat Mar 1 2008 - Devrim GUNDUZ <devrim at commandprompt.com> 1.1.2-1
- Update to 1.1.2
- Various spec file improvements, per bz review #244593 .

* Fri Oct 26 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.1.1-1
- Update to 1.1.1

* Tue Oct 9 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.1-1
- Update to 1.1

* Tue Sep 25 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.0.8-2
- Added init script from Darcy.

* Tue Sep 18 2007 - Darcy Buskermolen <darcyb at commandprompt.com> 1.0.8-1
- Update to pgBouncer 1.0.8
- Add libevent to requires

* Sat Jun 18 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 1.0.7-2
- Prepare for Fedora review
- Change spec file name

* Thu May 03 2007 David Fetter <david at fetter.org> 1.0.7-1
- Initial build 


--- NEW FILE pgbouncer.sysconfig ---
# pgbouncer defaults
#

# Path to the init file
BOUNCERCONF=/etc/pgbouncer.ini

# Path to the log file
BOUNCERLOG=/var/log/pgbouncer.log



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Aug 2008 21:00:25 -0000	1.1
+++ .cvsignore	31 Aug 2008 10:49:05 -0000	1.2
@@ -0,0 +1 @@
+pgbouncer-1.2.3.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgbouncer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Aug 2008 21:00:25 -0000	1.1
+++ sources	31 Aug 2008 10:49:05 -0000	1.2
@@ -0,0 +1 @@
+e8afc79103cd464c109a56e418a9ba24  pgbouncer-1.2.3.tgz




More information about the fedora-extras-commits mailing list