Fix bugs 478142, 478240, and 477350.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

4 files changed, 111 insertions, 9 deletions

diff --git a/dev-db/pgbouncer/ChangeLog b/dev-db/pgbouncer/ChangeLog
index 62ffa23c5faa..4b4dbd4c6a66 100644
--- a/dev-db/pgbouncer/ChangeLog
+++ b/dev-db/pgbouncer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/pgbouncer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/ChangeLog,v 1.11 2013/07/19 00:55:04 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/ChangeLog,v 1.12 2013/08/18 20:19:50 titanofold Exp $
+
+*pgbouncer-1.5.4-r1 (18 Aug 2013)
+
+  18 Aug 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  +pgbouncer-1.5.4-r1.ebuild, files/pgbouncer.initd:
+  Fix bugs 478142, 478240, and 477350.
 
   19 Jul 2013; Aaron W. Swenson <titanofold@gentoo.org> pgbouncer-1.5.4.ebuild:
   Fix dependencies.
diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest
index 086028d0396d..e4f228ff3869 100644
--- a/dev-db/pgbouncer/Manifest
+++ b/dev-db/pgbouncer/Manifest
@@ -4,15 +4,16 @@ Hash: SHA256
 AUX logrotate 119 SHA256 09e12d5f8f026251a0a8532dfc181199085e4cc23a3f4cbb4dd15a4bea5af6ad SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8 WHIRLPOOL 982d153670d43bf5b195988887474cd8b4dc268dc663ce88d430f86d83f6cf5cd3bc0455495eb8d225fe4d6179b5bf6e3136d3d960cb9b1d1dabeb0b2f4288a3
 AUX pgbouncer-dirs.patch 685 SHA256 d5b0875000c89e945b0eb3f3007d68b211d675a4e18872ef7166c76dbd3eb695 SHA512 6a475bf5cff10b464177af619051529ad78e802c56655500ad23130c5989721f41592387f9bf6719810eae2d876a8dd36219b87ae1fdb29304b2adc98c49ae4c WHIRLPOOL ac8df7239880f21479bec1153a4b9a6ab4da937bccec38205785ccc4f951b4d8a227e94c12f564b2694803a2a43c5390c4700944c9ed60f55fdbeeec370439c7
 AUX pgbouncer.confd 425 SHA256 e681f992f6051bc1bb2887f712530c38be1c0a2ffb8ee254d0438b8679f55b9c SHA512 9f997cbfb18f5bb1623aea2a9af706359a973fd2167be91ee6ffb37a22a6dc453280c66b6d2c11ab0174dbf159a195f0a1612be198466633d728a5317a878035 WHIRLPOOL bbad3f2609c638e859e44555e25bef1249a7cbb024a7f6e07f4cee57bfc1571d8100a43715360d2d03a9bf62b0ed65878339cc5f641ac0f3736296a93c597b6f
-AUX pgbouncer.initd 1882 SHA256 f72ab3dd5b3ec3633f1c0d42972f8911c5e3716c5d693c0f48919bb05c23802a SHA512 f06a33f5c122c06b293671230313c266e6f62d0929ff7039c40ad5347dcc5805214f9b9bf97a63cdec9006c701e20c10577b05cae061ac557aee867d22c786fb WHIRLPOOL 31a82dfb8216c8daafa32027bdc5372bc80a451bf448b7fb18ec45dd4ea2b18f80224be230c5252ece948302d0cbd2d7f2f8924179fad8f32f976fa1c85d975b
+AUX pgbouncer.initd 2182 SHA256 50894b7b28713e19c13575a2dd4250f91268bb7ede4d8a4c756b520faa6de342 SHA512 3d9037adb342a2d8c9e0e447ca3d1926243d69597622806d1dd4b35dad58fec4b7d9f3bd2dfc49257e4a54e9fbcf9290f3a0f93762d9e2dbb104626700527609 WHIRLPOOL 2c22871a06c1e043dfa2821d43ced9bd18606bb56ecce3f3963c5661a0f12ce650b4496b9bbd185f49aade2e32bd59c5ab056f5e1979dcef7878b2b97fcb6c3b
 DIST pgbouncer-1.5.4.tar.gz 339610 SHA256 08040482f4c887e14d8c8c46fab838fff640c0f3cf231f86ad7f766b7a292280 SHA512 ade8304eba682a468a5e4c1c5e661d67ea64fad951d6f767a3157de4e5398c52492b2ca022f274c55e43022df8d5fad87e45fc60adbcbab00a5ac843a26c6b71 WHIRLPOOL 107d028eaa4ea9f0469994ca9fa3caab64fc33dd2c7228aa7784b04b89091352a6b086fe7123ddfbcc9900b1c1cadef4c08030d9b9a5b169a4be4441ff3a6f02
+EBUILD pgbouncer-1.5.4-r1.ebuild 1930 SHA256 f915ca8117410e6d133d15538b2ee6e42e1c9f54a2c95b21ad895b9a4dcb9872 SHA512 6b425b203b3a81e64363ef30c8df5cff80e021037755a80a04ecf255e4a64483d5d80b7b3b707accd1782b86491e84b8ea256edf44317b6d109a25a0b5c729f4 WHIRLPOOL 72c8fb09efc922a2e109ab99e3e46035a0dc6bbcfc9c3b56a2978e629a0c7efddb1532643009326c078a30b642ea7ccb357239d3b273f74d5c79697c0a59cfe8
 EBUILD pgbouncer-1.5.4.ebuild 1944 SHA256 215abd41066c2d7b9d7a1be30d5567dda81ae19308edd75c2f765e44a672f59d SHA512 970d0a6be1184e17c6b59bcde5e87ec404660644f774981cf914a646187a341805cb1fc633d9ce1a5e1ed617ef7c2f1a362627142225992bce03a0c05dff93e1 WHIRLPOOL 3b1e4213b8735e81b831b1124420876fbec652b32beceb051c501e3260ae915d60ffec9df89b4c16ed32a0ad598efd7c253ff565499e946b6909270f08c8d817
-MISC ChangeLog 2149 SHA256 39234723fac37b7e27baddafa3208206ab0dfa738f3ea64592c2a4f0e93317e5 SHA512 4070499a3b497102bad84ee38e044f99df972b2d0e1558d72e57a204f368c6fa097e33823bde989ffb7aa4cae3f862fae2aea5cb16d17aa7ae0f22570826bf72 WHIRLPOOL 21428cd230f98e8bad91c522638df8e5bf976ab150352b094adb60315ee283ae8d0febbba16c80a3d2843a67c1bf6965d43b796ffb257126a558f8d03c0c6b4e
+MISC ChangeLog 2333 SHA256 f70c4fef30df3d323f855369c636c0fd11ce920876c855afbd6801d258e50d58 SHA512 6b2d9f5ab817d65753a61d77674c99edbe4b59e3bc7dbff76c361b7de8ac3c0760c86248d9143540dae1fefe4a684a1bda6227825b97b8c2c4ccf3e2b3d499bb WHIRLPOOL e6439ad84d9967e4846412304b3d31bdd2a3602f4483c3dd2a2e5c1e2bfa31f7078b5c1050ebaa03a16782468267715c946a3fb92feff6e1de33343aa64b2374
 MISC metadata.xml 687 SHA256 6c86b074d669b130901588bfe5683a3dd86895219cc9e6c94ffe88671065b67f SHA512 37821a44019dcd379378d1acc28d59dcbd6b0cca8366a941a179d6338c92825233b113d53ef4d15ffa32ac40b127b04f74e8b3ce7af21185d08758286389a285 WHIRLPOOL 6937473b0039b501309065643b79220fd85978cff813358f30567e1540e3124060b3ab53c3d15ca92911bb0ac27f7dc6cb00585181731820dc10c821dec09a20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHojmoACgkQVxOqA9G7/aBzlgD9EIetbeO14P052PD/1ZnvpdOt
-ytfZiXZ8COXhM5Wptw4A/2RV/dSWXsFTCsetXD/u/EP/jiu6ALHfHoRi0hwUX5+I
-=4SIp
+iF4EAREIAAYFAlIRLOMACgkQVxOqA9G7/aDMRwEAgVEOgTNeas5r8MYrx+V3yp5/
+f8Bb7XkVzkaQStFNUmcA/2EKCWI/bhzT0u5hzW+u4pTMlper6fl4D0SNLpJHXsRI
+=Aq5T
 -----END PGP SIGNATURE-----
diff --git a/dev-db/pgbouncer/files/pgbouncer.initd b/dev-db/pgbouncer/files/pgbouncer.initd
index 594129c674f4..f97481501aaf 100644
--- a/dev-db/pgbouncer/files/pgbouncer.initd
+++ b/dev-db/pgbouncer/files/pgbouncer.initd
@@ -22,15 +22,26 @@ prep() {
         checkpath -o postgres:postgres -m 0775 -d "${UNIX_SOCKET_DIR}" \
             || return 1
     fi
+    checkpath -o pgbouncer:postgres -m 0755 -d "$(dirname ${PIDFILE})" \
+        || return 1
     checkpath -o pgbouncer:postgres -m 0644 -f "${PIDFILE}" \
         || return 1
+    checkpath -o pgbouncer:postgres -m 0755 -d "$(dirname $(get_config logfile))" \
+        || return 1
     checkpath -o pgbouncer:postgres -m 0640 -f "$(get_config logfile)" \
         || return 1
+
+    return 0
 }
 
 start() {
     ebegin "Starting PgBouncer"
-    prep || eend 1
+    prep
+    local ret=$?
+    if [ $ret -ne 0 ] ; then
+        eend $ret
+        exit $ret
+    fi
     start-stop-daemon --start \
         --pidfile ${PIDFILE} \
         --user pgbouncer \
@@ -39,14 +50,14 @@ start() {
 }
 
 stop() {
-    local seconds=$(( ${NICE_TIMEOUT} + ${FORCE_TIMEOUT} ))
+    local seconds=$(( ${NICE_TIMEOUT} + ${FORCE_QUIT_TIMEOUT} ))
     ebegin "Stopping PgBouncer (this can take up to ${seconds} seconds)"
 
     local retries=SIGINT/${NICE_TIMEOUT}
 
     if [ "${FORCE_QUIT}" = "YES" ] ; then
         einfo "FORCE_QUIT enabled."
-        retries="${retries}/SIGTERM/${FORCE_TIMEOUT}"
+        retries="${retries}/SIGTERM/${FORCE_QUIT_TIMEOUT}"
     fi
 
     # Loops through nice and force quit in one go.
diff --git a/dev-db/pgbouncer/pgbouncer-1.5.4-r1.ebuild b/dev-db/pgbouncer/pgbouncer-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..72bf3e668cf2
--- /dev/null
+++ b/dev-db/pgbouncer/pgbouncer-1.5.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.4-r1.ebuild,v 1.1 2013/08/18 20:19:50 titanofold Exp $
+
+EAPI="5"
+
+# Upstream has *way* broken tests.
+RESTRICT="test"
+
+inherit eutils user
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
+SRC_URI="mirror://postgresql/projects/pgFoundry/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libevent udns"
+REQUIRED_USE="
+	libevent? ( !udns )
+	udns? ( !libevent )
+"
+RDEPEND="
+	>=sys-libs/glibc-2.10
+	libevent? ( >=dev-libs/libevent-2.0 )
+	udns? ( >=net-libs/udns-0.1 )
+"
+
+DEPEND="
+	${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=app-text/asciidoc-8.4
+"
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	enewuser pgbouncer -1 -1 -1 postgres
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgbouncer-dirs.patch"
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-debug \
+		$(use_enable debug cassert) \
+		$(use_with libevent) \
+		$(use_with udns)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	insinto /etc
+	doins etc/pgbouncer.ini
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" pgbouncer
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo "Please read the config.txt for Configuration Directives"
+		einfo
+		einfo "For Administration Commands, see:"
+		einfo "    man pgbouncer"
+		einfo
+		einfo "By default, PgBouncer does not have access to any database."
+		einfo "GRANT the permissions needed for your application and make sure that it"
+		einfo "exists in PgBouncer's auth_file."
+	fi
+}