diff options
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/pgbouncer/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/pgbouncer/Manifest | 9 | ||||
| -rw-r--r-- | dev-db/pgbouncer/files/modify-config-paths.patch | 24 | ||||
| -rw-r--r-- | dev-db/pgbouncer/files/pgbouncer.initd | 12 | ||||
| -rw-r--r-- | dev-db/pgbouncer/pgbouncer-1.4.ebuild (renamed from dev-db/pgbouncer/pgbouncer-1.3.4.ebuild) | 16 |
5 files changed, 26 insertions, 43 deletions
diff --git a/dev-db/pgbouncer/ChangeLog b/dev-db/pgbouncer/ChangeLog index 749b432f7..571a75dac 100644 --- a/dev-db/pgbouncer/ChangeLog +++ b/dev-db/pgbouncer/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for dev-db/pgbouncer -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Feb 2011; Johan Bergström (jbergstroem) <bugs@bergstroem.nu> + -pgbouncer-1.3.4.ebuild, +pgbouncer-1.4.ebuild, + -files/modify-config-paths.patch, files/pgbouncer.initd: + Version bump - minor fixes to init and ebuild as well as removing custom + patch for a simple sed (makes version bumps less painful) + 13 Sep 2010; Johan Bergström (jbergstroem) <bugs@bergstroem.nu> -pgbouncer-1.3.3.ebuild, +pgbouncer-1.3.4.ebuild, files/modify-config-paths.patch: diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest index 5360c2b46..23c8f0f35 100644 --- a/dev-db/pgbouncer/Manifest +++ b/dev-db/pgbouncer/Manifest @@ -1,6 +1,5 @@ -AUX modify-config-paths.patch 647 RMD160 b70cdfc927eb400b59a0b01d2210a2b4d46fd307 SHA1 3c78a4bef9d362ff30c42247f3b7de9d9c4f924a SHA256 73276d93159625e1ca079a30e3a5e911dea012048720ee6bb12d25c6eec399a5 -AUX pgbouncer.initd 551 RMD160 5a1de7ff3a60b8f9257d42a11b27053620600cff SHA1 c5de3abe36e4aa0a57ccf198f58ddeccbef083a7 SHA256 7b4b5b5510b98786a4d5f7c9cd1d1ba48f3eee65438aa09211f1d50e1b5b1c6e -DIST pgbouncer-1.3.4.tgz 167957 RMD160 271ac0b2f725e11956369b385ff3ff8370f203ca SHA1 1eaa25258657297e776d83623cc2526133051011 SHA256 74eba35f6e088d45a49e4b2226b266d8d5649af498f72f771a22873fa9b16fe7 -EBUILD pgbouncer-1.3.4.ebuild 1591 RMD160 9c2b86398baf4405abb5c998f0a06f94f99432b3 SHA1 fca750996dd1c703a086bebeb84820c5fa7728b9 SHA256 296767f0f8d94923959f99e0430006ee072e8fd73ee385314f1072be2c1d2ab5 -MISC ChangeLog 1788 RMD160 3bb56979d55361a02fc75eec0fe916fbe3ce18d3 SHA1 043e4d96e196c4ffc787db22d9388e50e02755cb SHA256 a18a945263609e5f934dc585d46ef122380d217bc86a4b370692b16cfd5e399b +AUX pgbouncer.initd 539 RMD160 8a8a02a266840cf12b5eff5799d6456b7f0fd524 SHA1 7f8bb5dddb3ff830c1cd38fc22a9c13150bfc0d4 SHA256 b8feda0725afdd9c9204d99fc1ea1965f28ef30f4302f2aa7cb8b10ef3003e9f +DIST pgbouncer-1.4.tgz 231691 RMD160 3a3e4ea9dcbefc309e6aafa74b079963e5b6a53b SHA1 f0c9ffd7b65250feee1865ba83a62ff857f226bb SHA256 e94a8e7edd6de4ae6978e8f485bbc6a610195b56b1f5fe95a49bfd70959628fb +EBUILD pgbouncer-1.4.ebuild 1736 RMD160 59cc675bea25253dbe35c0f76bee0dcb53c6468b SHA1 c27960d61796e9136391c27ccec01b1c02f5ac80 SHA256 7243acfdd9c6be8e7991f71c58b3092988e4b17f79ab8f9c6a36f48955bec602 +MISC ChangeLog 2100 RMD160 e7c55ebd15e067deedf90ba1894840dc43f7edab SHA1 a1789fa9a587fce83f48d75fcde24dabda5c54e8 SHA256 08001065350183375508ab9440368921cb2a5f1bb1249cd9f6a6d52937ce940c MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f diff --git a/dev-db/pgbouncer/files/modify-config-paths.patch b/dev-db/pgbouncer/files/modify-config-paths.patch deleted file mode 100644 index 734a6072d..000000000 --- a/dev-db/pgbouncer/files/modify-config-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/etc/pgbouncer.ini b/etc/pgbouncer.ini -index 874b639..ffada4d 100644 ---- a/etc/pgbouncer.ini -+++ b/etc/pgbouncer.ini -@@ -22,8 +22,8 @@ nondefaultdb = pool_size=50 reserve_pool=10 - ;;; Administrative settings - ;;; - --logfile = pgbouncer.log --pidfile = pgbouncer.pid -+logfile = /var/log/pgbouncer/pgbouncer.log -+pidfile = /var/run/pgbouncer/pgbouncer.pid - - ;;; - ;;; Where to wait for clients -@@ -41,7 +41,7 @@ unix_socket_dir = /tmp - ; any, trust, plain, crypt, md5 - auth_type = trust - #auth_file = 8.0/main/global/pg_auth --auth_file = etc/userlist.txt -+auth_file = /etc/userlist.txt - - ;;; - ;;; Users allowed into database 'pgbouncer' diff --git a/dev-db/pgbouncer/files/pgbouncer.initd b/dev-db/pgbouncer/files/pgbouncer.initd index 82d29078f..443140426 100644 --- a/dev-db/pgbouncer/files/pgbouncer.initd +++ b/dev-db/pgbouncer/files/pgbouncer.initd @@ -1,5 +1,7 @@ #!/sbin/runscript +PIDFILE=/var/run/pgbouncer/pgbouncer.pid + opts="start stop reload" depend() { @@ -10,19 +12,19 @@ depend() { start() { ebegin "Starting pgbouncer" - start-stop-daemon --start --pidfile /var/run/pgbouncer/pgbouncer.pid \ - --exec /usr/bin/pgbouncer -- -d -u pgbouncer /etc/pgbouncer.conf + start-stop-daemon --start --pidfile ${PIDFILE} \ + --exec /usr/bin/pgbouncer -- -q -d -u pgbouncer /etc/pgbouncer.conf eend $? "Failed to start pgbouncer" } stop() { ebegin "Stopping pgbouncer" - start-stop-daemon --stop --quiet --pidfile /var/run/pgbouncer/pgbouncer.pid + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} eend $? } reload() { - ebegin "Reloading pgbouncer configuration" - kill -HUP `cat /var/run/pgbouncer/pgbouncer.pid` + ebegin "Gracefully reloading pgbouncer" + kill -HUP `cat ${PIDFILE}` &>/dev/null eend $? } diff --git a/dev-db/pgbouncer/pgbouncer-1.3.4.ebuild b/dev-db/pgbouncer/pgbouncer-1.4.ebuild index a9eb537e2..fb0897b0e 100644 --- a/dev-db/pgbouncer/pgbouncer-1.3.4.ebuild +++ b/dev-db/pgbouncer/pgbouncer-1.4.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="2" -inherit autotools eutils - RESTRICT="test" DESCRIPTION="Lightweight connection pooler for PostgreSQL" HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/" -SRC_URI="http://pgfoundry.org/frs/download.php/2797/${P}.tgz" +SRC_URI="http://pgfoundry.org/frs/download.php/2912/${P}.tgz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug doc" -DEPEND=">=dev-db/postgresql-base-8.0 +DEPEND="dev-db/postgresql-base dev-libs/libevent" RDEPEND="${DEPEND}" @@ -27,13 +25,15 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/modify-config-paths.patch" - eautoreconf -f + sed -i -e "s,pgbouncer.log,/var/log/pgbouncer/pgbouncer.log," \ + -e "s,pgbouncer.pid,/var/run/pgbouncer/pgbouncer.pid," \ + -e "s,etc/userlist.txt,/etc/userlist.txt," etc/pgbouncer.ini || die } src_configure() { + # --enable-debug is only used to disable stripping econf \ - $(use_enable debug) \ + --enable-debug \ $(use_enable debug cassert) \ --docdir=/usr/share/doc/${PF} } |