Version bump; add reload init script option (#197202).

Package-Manager: portage-2.1.3.9

8 files changed, 52 insertions, 88 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 0eb4fc63766b..4848a9ad035f 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.8 2007/08/18 14:43:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.9 2007/10/27 10:42:31 mrness Exp $
+
+*haproxy-1.3.13 (27 Oct 2007)
+
+  27 Oct 2007; Alin Năstac <mrness@gentoo.org> files/haproxy.initd,
+  -haproxy-1.2.16.ebuild, -haproxy-1.3.11.4.ebuild, +haproxy-1.3.13.ebuild:
+  Version bump; add reload init script option (#197202).
 
 *haproxy-1.3.12 (18 Aug 2007)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index ebf43aedcb2d..ec939a5547b5 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,46 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX haproxy.initd 753 RMD160 1f46ddda90599de303da2df4014a1c9628ae957d SHA1 d59aa2eeba3c441750a689d2e6e50ccbca935e68 SHA256 0a1a63e439fbf153c2e7a75cebefd3e8ec05fa17112b76bd981def590b6639fd
-MD5 294d49e9bae1fbcf784a7f5feb14f0eb files/haproxy.initd 753
-RMD160 1f46ddda90599de303da2df4014a1c9628ae957d files/haproxy.initd 753
-SHA256 0a1a63e439fbf153c2e7a75cebefd3e8ec05fa17112b76bd981def590b6639fd files/haproxy.initd 753
-DIST haproxy-1.2.16.tar.gz 197867 RMD160 f9fde12bd4d9ef3397c5f56f6ba679d8d65699c2 SHA1 96df1ed2b517123d986570e23380d39560064dd2 SHA256 c8635aaf761f3bb74676d6cbc1ebb415cdcebebcdb46261a737a7d69c4251f2f
-DIST haproxy-1.3.11.4.tar.gz 346397 RMD160 deca2bef441147f68bc3392a0ede26cbe6b23fb6 SHA1 0e94b548561e2e623eaec040a0ab86e70fae37f2 SHA256 2bb1b87f377080ee35f19cca952adf9d439446735bab683a167dacd229f05bbd
+AUX haproxy.initd 948 RMD160 a2be74ba6c0672544e4f90ff28b3671e3493a7d3 SHA1 3d003a7f2d1bbb078ca6e51d2588605f0c4700a7 SHA256 4ffccbd0e635ba89235561669cab9e9d4cd8f13e1d8028213c08e9123f092628
+MD5 15f885a813adcb296d086592bb3d4f59 files/haproxy.initd 948
+RMD160 a2be74ba6c0672544e4f90ff28b3671e3493a7d3 files/haproxy.initd 948
+SHA256 4ffccbd0e635ba89235561669cab9e9d4cd8f13e1d8028213c08e9123f092628 files/haproxy.initd 948
 DIST haproxy-1.3.12.tar.gz 355376 RMD160 85e27de7cc3b2334662a36c27903073d361491cf SHA1 d7c6e295957ef95b62d21d503e8ce6ef4685f640 SHA256 6fc6a48ed67ef10ba860f8a16a27d7de1d8499c331aa8037ea129c230caf141b
-EBUILD haproxy-1.2.16.ebuild 1311 RMD160 00829131ba64ea9551339539c75d41d4d87c477e SHA1 227c482ccbd40a682f57892f013f70b54ba9a162 SHA256 bb8dc7e3d7897febc5e5f51e79d30789d8af2e6bcc84a8cfdb17ccce5f5cb9f7
-MD5 933537284adfe503624ab17fd0e0c821 haproxy-1.2.16.ebuild 1311
-RMD160 00829131ba64ea9551339539c75d41d4d87c477e haproxy-1.2.16.ebuild 1311
-SHA256 bb8dc7e3d7897febc5e5f51e79d30789d8af2e6bcc84a8cfdb17ccce5f5cb9f7 haproxy-1.2.16.ebuild 1311
-EBUILD haproxy-1.3.11.4.ebuild 1372 RMD160 75dc7b032220b7030e549e7b8e5b85a7b9ae9963 SHA1 1e11023b0975b82f6196a9e0dac50cd34fd7b6b4 SHA256 92369d09a8e147153d4fc2e517038c4f99ec2508bce73896a61b1702a9bb23bf
-MD5 a7b9b2613ed7bd46efc220d36baf0d81 haproxy-1.3.11.4.ebuild 1372
-RMD160 75dc7b032220b7030e549e7b8e5b85a7b9ae9963 haproxy-1.3.11.4.ebuild 1372
-SHA256 92369d09a8e147153d4fc2e517038c4f99ec2508bce73896a61b1702a9bb23bf haproxy-1.3.11.4.ebuild 1372
+DIST haproxy-1.3.13.tar.gz 387175 RMD160 1b7b6dfc652352882c990b379953fba713759871 SHA1 2aebdb847c02b16fa2a51efba3c520d64e0d9b75 SHA256 11ff8012a7a720f3c4eec39337f7449a1e22a25f3cf5f565b75733607b8c55e7
 EBUILD haproxy-1.3.12.ebuild 1388 RMD160 dd010afbc8bedccc5f6b8ac72f64c8719d68ed35 SHA1 b37874afdb5c7b8f8616665f5372a42fde156087 SHA256 7bcfa54c65edd3b690edb1507507d112f4ec5512d90b31903672683f541db447
 MD5 0e205e6d0a4bdb71fb12c2dc21696d59 haproxy-1.3.12.ebuild 1388
 RMD160 dd010afbc8bedccc5f6b8ac72f64c8719d68ed35 haproxy-1.3.12.ebuild 1388
 SHA256 7bcfa54c65edd3b690edb1507507d112f4ec5512d90b31903672683f541db447 haproxy-1.3.12.ebuild 1388
-MISC ChangeLog 1291 RMD160 4f507a7add1db9e8a18328cfe076ca3629f3a609 SHA1 960b4ef43e119043b9d90b392c87c3a288091641 SHA256 fd2aa43d3511169db3c74a605ac503ae49238006dd38e47cc78889fead5ab71e
-MD5 3edbe8c0da268c06ef8e30fdaa5d4a04 ChangeLog 1291
-RMD160 4f507a7add1db9e8a18328cfe076ca3629f3a609 ChangeLog 1291
-SHA256 fd2aa43d3511169db3c74a605ac503ae49238006dd38e47cc78889fead5ab71e ChangeLog 1291
+EBUILD haproxy-1.3.13.ebuild 1388 RMD160 70c57685e276f651a9f368ec30ea05f29c0ffc7d SHA1 daebeffb78d412552ae9236f38a103920f4aa02b SHA256 8e2cc75f51f966dcf3a159133f23d52ea261911faf1a547d5149e4b4d824432e
+MD5 250a708a6cc8f7672e6876839896e6d3 haproxy-1.3.13.ebuild 1388
+RMD160 70c57685e276f651a9f368ec30ea05f29c0ffc7d haproxy-1.3.13.ebuild 1388
+SHA256 8e2cc75f51f966dcf3a159133f23d52ea261911faf1a547d5149e4b4d824432e haproxy-1.3.13.ebuild 1388
+MISC ChangeLog 1525 RMD160 2b9e505cc07a516cb36a87fd8e080c0dfdf321a2 SHA1 b3ca329a88dfdb055e841ded3ebb3f7fe7a4afc0 SHA256 be85c3e6782b07a5cd3523eff21de3ce05ecb2be6fe84ceadb1301d7404b4a37
+MD5 9044be22cc655187c9d8b01bd312e3a7 ChangeLog 1525
+RMD160 2b9e505cc07a516cb36a87fd8e080c0dfdf321a2 ChangeLog 1525
+SHA256 be85c3e6782b07a5cd3523eff21de3ce05ecb2be6fe84ceadb1301d7404b4a37 ChangeLog 1525
 MISC metadata.xml 929 RMD160 5165e64077d97077bfd334036f3a6c50defacfbe SHA1 1df1db8e4ded2e77dc7dc8b500c013e27bde027d SHA256 f59d153f4707b2195eb319ac40844a2c264a3231656fa75846a5d33422b9f6a4
 MD5 6710b828e4b6762de067c846f321c403 metadata.xml 929
 RMD160 5165e64077d97077bfd334036f3a6c50defacfbe metadata.xml 929
 SHA256 f59d153f4707b2195eb319ac40844a2c264a3231656fa75846a5d33422b9f6a4 metadata.xml 929
-MD5 c28a0bb769034a99dd4ec2a472625f9d files/digest-haproxy-1.2.16 244
-RMD160 79b4faa33b065c5817fecfce65f41f8bfba2f5a4 files/digest-haproxy-1.2.16 244
-SHA256 c177f5ba6574a28b70cde2110da958763f5e750f0b09c449c90dc1a8dd7ac397 files/digest-haproxy-1.2.16 244
-MD5 6af63a21c887e7c3e8207a0dcb0f1238 files/digest-haproxy-1.3.11.4 250
-RMD160 bd1649948a0e1aebd1c31d234802a3da1b5dd0f4 files/digest-haproxy-1.3.11.4 250
-SHA256 1c6533e96c2746e9eb701acb5666c7be9e5b8e3de5d4892875006aea1c4a9a5b files/digest-haproxy-1.3.11.4 250
 MD5 70cc412edcd96225fe08d7b7ef0f41d0 files/digest-haproxy-1.3.12 244
 RMD160 d19205b18dcd99c122086ec58d37310d506efbe5 files/digest-haproxy-1.3.12 244
 SHA256 47cde54a118599cb6c1028d19ea99ddad1e17b5bf10cc3900dd8957beee9152f files/digest-haproxy-1.3.12 244
+MD5 707ed2d2e534cbcc4f40bfa27853ab6b files/digest-haproxy-1.3.13 244
+RMD160 f875e90a7cbfe9ac7c08ff0d17e67fbebbaa6192 files/digest-haproxy-1.3.13 244
+SHA256 1a16a5df5b01f5ccb0443e3edd6a7d240ca9408e6aeaa6f013418c2c1732bc48 files/digest-haproxy-1.3.13 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGxwWBVSA5X31g7/gRAqgRAJ4ljoDd47B58gl+9JFYB2HhFMDH7ACeImBX
-+qgpVOTas/661FTG/qxXpJE=
-=lCQ+
+iD8DBQFHIxYiVSA5X31g7/gRAqbzAJ4yELBPs3vKZqGn+Owme+u1l9hT5QCcCiHv
+HV2z8on9o2sGneJZPclGhAM=
+=Uqz6
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/files/digest-haproxy-1.2.16 b/net-proxy/haproxy/files/digest-haproxy-1.2.16
deleted file mode 100644
index 1262ca2339b3..000000000000
--- a/net-proxy/haproxy/files/digest-haproxy-1.2.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f72c44bcddf868edf4000503be09a12d haproxy-1.2.16.tar.gz 197867
-RMD160 f9fde12bd4d9ef3397c5f56f6ba679d8d65699c2 haproxy-1.2.16.tar.gz 197867
-SHA256 c8635aaf761f3bb74676d6cbc1ebb415cdcebebcdb46261a737a7d69c4251f2f haproxy-1.2.16.tar.gz 197867
diff --git a/net-proxy/haproxy/files/digest-haproxy-1.3.11.4 b/net-proxy/haproxy/files/digest-haproxy-1.3.11.4
deleted file mode 100644
index 0c82d481d870..000000000000
--- a/net-proxy/haproxy/files/digest-haproxy-1.3.11.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51dd99e4c9b4b40ff165ea4d689cacd6 haproxy-1.3.11.4.tar.gz 346397
-RMD160 deca2bef441147f68bc3392a0ede26cbe6b23fb6 haproxy-1.3.11.4.tar.gz 346397
-SHA256 2bb1b87f377080ee35f19cca952adf9d439446735bab683a167dacd229f05bbd haproxy-1.3.11.4.tar.gz 346397
diff --git a/net-proxy/haproxy/files/digest-haproxy-1.3.13 b/net-proxy/haproxy/files/digest-haproxy-1.3.13
new file mode 100644
index 000000000000..7b93cdae5d77
--- /dev/null
+++ b/net-proxy/haproxy/files/digest-haproxy-1.3.13
@@ -0,0 +1,3 @@
+MD5 a4c8eac779ff2f8716ba7afda826b9fc haproxy-1.3.13.tar.gz 387175
+RMD160 1b7b6dfc652352882c990b379953fba713759871 haproxy-1.3.13.tar.gz 387175
+SHA256 11ff8012a7a720f3c4eec39337f7449a1e22a25f3cf5f565b75733607b8c55e7 haproxy-1.3.13.tar.gz 387175
diff --git a/net-proxy/haproxy/files/haproxy.initd b/net-proxy/haproxy/files/haproxy.initd
index ac4c3de3eeb6..b86d93f236ee 100644
--- a/net-proxy/haproxy/files/haproxy.initd
+++ b/net-proxy/haproxy/files/haproxy.initd
@@ -1,14 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.2 2007/03/30 08:47:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.3 2007/10/27 10:42:32 mrness Exp $
+
+opts="${opts} reload"
+
+CONFFILE=/etc/${SVCNAME}.cfg
+PIDFILE=/var/run/${SVCNAME}.pid
 
 checkconfig() {
-	if [ ! -f /etc/haproxy.cfg ]; then
-		eerror "/etc/haproxy.cfg does not exist!"
+	if [ ! -f "${CONFFILE}" ]; then
+		eerror "${CONFFILE} does not exist!"
 		return 1
 	fi
-	/usr/bin/haproxy -c -f /etc/haproxy.cfg >/dev/null 
+	/usr/bin/haproxy -c -f "${CONFFILE}" >/dev/null 
 }
 
 depend() {
@@ -19,15 +24,21 @@ depend() {
 start() {
 	checkconfig || return 1
 
-	ebegin "Starting haproxy"
+	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --quiet \
 		--exec /usr/bin/haproxy \
-		-- -D -p /var/run/haproxy.pid -f /etc/haproxy.cfg
+		-- -D -p "${PIDFILE}" -f "${CONFFILE}"
 	eend ${?}
 }
 
 stop() {
-	ebegin "Stopping haproxy"
-	start-stop-daemon --stop --quiet --pidfile /var/run/haproxy.pid
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+	eend ${?}
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	/usr/bin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}")
 	eend ${?}
 }
diff --git a/net-proxy/haproxy/haproxy-1.2.16.ebuild b/net-proxy/haproxy/haproxy-1.2.16.ebuild
deleted file mode 100644
index b4f0639d3030..000000000000
--- a/net-proxy/haproxy/haproxy-1.2.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.2.16.ebuild,v 1.2 2007/01/09 22:11:23 robbat2 Exp $
-
-inherit linux-info
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/1.2/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="pcre"
-
-DEPEND="pcre? ( >=dev-libs/libpcre-6.3 )"
-
-src_compile() {
-	local ARGS="TARGET=linux${KV_MAJOR}${KV_MINOR}"
-	use pcre && ARGS="${ARGS} REGEX=pcre"
-	emake ADDINC="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS}
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe haproxy
-	newinitd "${FILESDIR}/haproxy.initd" haproxy
-
-	dodoc CHANGELOG ROADMAP TODO doc/*
-	docinto examples
-	dodoc examples/examples.cfg examples/haproxy.cfg
-}
-
-pkg_postinst() {
-	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
-		einfo "You need to create /etc/haproxy.cfg before you start haproxy service."
-		if [[ -d "${ROOT}/usr/share/doc/${P}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${ROOT}usr/share/doc/${P}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.3.11.4.ebuild b/net-proxy/haproxy/haproxy-1.3.13.ebuild
index dd435e3c6324..764bdd52019a 100644
--- a/net-proxy/haproxy/haproxy-1.3.11.4.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.13.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.11.4.ebuild,v 1.1 2007/06/17 06:26:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.13.ebuild,v 1.1 2007/10/27 10:42:31 mrness Exp $
 
 inherit linux-info
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/${PV%.*.*}/src/${P}.tar.gz"
+SRC_URI="http://haproxy.1wt.eu/download/${PV%.*}/src/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="pcre"
 
 DEPEND="pcre? ( >=dev-libs/libpcre-6.3 )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	local ARGS="TARGET=linux${KV_MAJOR}${KV_MINOR}"