diff options
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/gatling/ChangeLog | 8 | ||||
-rw-r--r-- | www-servers/gatling/Manifest | 15 | ||||
-rw-r--r-- | www-servers/gatling/files/gatling.initd-2 | 63 | ||||
-rw-r--r-- | www-servers/gatling/files/gentoo-vars.patch | 20 | ||||
-rw-r--r-- | www-servers/gatling/gatling-0.12-r2.ebuild | 57 |
5 files changed, 130 insertions, 33 deletions
diff --git a/www-servers/gatling/ChangeLog b/www-servers/gatling/ChangeLog index 2c63c73c3223..3dd759f9b4fb 100644 --- a/www-servers/gatling/ChangeLog +++ b/www-servers/gatling/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/gatling # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.9 2012/03/10 00:30:22 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.10 2012/03/22 00:39:53 patrick Exp $ + +*gatling-0.12-r2 (22 Mar 2012) + + 22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +files/gatling.initd-2, + +gatling-0.12-r2.ebuild, -files/gentoo-vars.patch: + Init script fixes for #409245 *gatling-0.12-r1 (10 Mar 2012) diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest index bc5a3b211bd1..485ec718fea7 100644 --- a/www-servers/gatling/Manifest +++ b/www-servers/gatling/Manifest @@ -1,19 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gatling-0.12-FLAGS.patch 929 RMD160 18b3ad9c44433a28fb8995cf2e13abd866af7630 SHA1 b44ed6f5e46f10397b736aed27f9527fae532f69 SHA256 d5a2e6d2c0fb97dde0c00d9cc9df365a2481f75cef72da14f6e0eb5b6ca8d733 AUX gatling.confd 659 RMD160 b90b117fba954b2743fa43d813e2bf673c9e27b9 SHA1 0d3b68d58908ab55f113e63c31b29fcef8ab694a SHA256 278ee92229263cf7cff919795e099ec22e6696cf9790fc805601ca38929f1d8e AUX gatling.initd 2029 RMD160 0e201c41590bc716563f45be2e959272f2ca498c SHA1 12d0aaaf5b7d15286cea13310a8da54172d3c1e4 SHA256 9a7184a37c2dae7019814b05dc03ff36ca0327479b712d8f2d72d0894aab5923 -AUX gentoo-vars.patch 471 RMD160 5ab9be9b889e7b41b887f3844587fabeb3f3f2b2 SHA1 b9bad9e5840962be7adcc44b02239972e55edae3 SHA256 6825dd24fd78309a43309fe22b53e20a0da8d1bcdf2ec99465d9972809c4f0fb +AUX gatling.initd-2 1969 RMD160 e3793c23a2cad3374ad001fdbf898179752efe25 SHA1 9949eb538f297baf24da2799eb5f83183c86eb4c SHA256 d6a712b6360628fa5262526743da9ae69f34ebb4af48061c3eb82bde43306a5c DIST gatling-0.12.tar.bz2 99540 RMD160 c4d0288fae752a4da86f5ad88f51c60a9086a3b1 SHA1 7397f3df9806f8cee3f92c7aa0d8f34a1593644d SHA256 ffe4dbff99404eb80e6aac215fdf6bf8174355edc33dd1848a51fc1093296a7c EBUILD gatling-0.12-r1.ebuild 1373 RMD160 9b24a1f14cf261d30621bcfeb488736df3f5e49c SHA1 d421e49e49202d15df09d3ee6b343f2ff356f098 SHA256 831e3058e58c53a238de97fa9a7b584328c22c8b9616daf75d74aa1c460df9ae +EBUILD gatling-0.12-r2.ebuild 1377 RMD160 a0324c158dce8bc45c4df369bb639987c45e0094 SHA1 fc748167bcadddb630b61d5fef9d8639aa52610d SHA256 ac43577ae44e7b389579d20e90cb8b4f38e88db39ab520c8c43b351b566e8c62 EBUILD gatling-0.12.ebuild 1311 RMD160 47ed51824a7ea3eeafe336190a1f50f0728eca0e SHA1 412667deb08522bd21e4462d1de179759f5bc5d3 SHA256 881c3b4033e3be4ae1b77182bacdc845eb24c57e81885927ec45eccdc2d6539d -MISC ChangeLog 1825 RMD160 cd1029946c79563ced163ecb78aa7713a6964a3e SHA1 1bd6f7708a09139c95be333cc4a56a2184199d62 SHA256 91d2adcd81c4477d92e7ea43d7de38bc8f94f2d186c360eaeaa60dca717870f9 +MISC ChangeLog 2020 RMD160 bd4ca104af716cb6b6fa2a9f1fd7cbdd06f99c34 SHA1 29309f7b32d2c411f517c750bab1f71de85c1289 SHA256 9931151396d1ae55ad4903202ae388bee7d212f07e8d19b1fb42d937313c5eae MISC metadata.xml 513 RMD160 da5842f5671b1123c522d510d52ced38f4911e5b SHA1 d24b9ac3ce5bddcb3b421a1287376bdfe2d4e5a0 SHA256 d931aff3d1d8c0a91b58530e0148e4ecd442172977f3c8c4888a7cf2ac978a64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iEYEARECAAYFAk9aoIUACgkQsAvGakAaFgARmwCggEc4NV9v4JrnENr4Efrqm5wX -xtIAoMF4XIexXs0oGbJXNR6IfMtBwPdF -=Zy6V ------END PGP SIGNATURE----- diff --git a/www-servers/gatling/files/gatling.initd-2 b/www-servers/gatling/files/gatling.initd-2 new file mode 100644 index 000000000000..0d5c5fcd4c19 --- /dev/null +++ b/www-servers/gatling/files/gatling.initd-2 @@ -0,0 +1,63 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Gatling high performance web server init script" +extra_started_commands="reload" + +depend() { + need net +} + +checkconfig() { + # Verify UID is valid for running process. + if [[ ! $(id ${GATLING_UID} 2>/dev/null) ]]; then + ewarn "User ${GATLING_UID} not found!" + return 1 + fi + + # Set gatling run opts + if yesno ${VHOST};then VHOST=-v;else VHOST=-V;fi + if yesno ${SSL};then SSL=-e;else SSL=-E;fi + if yesno ${DIR_INDEXING};then DIR_INDEXING=-d;else DIR_INDEXING=-D;fi + if yesno ${FTP}; then FTP=-f;else FTP=-F;fi + if yesno ${FTP_AUTH}; then FTP_AUTH=-l;else unset FTP_AUTH;fi + if yesno ${FTP_UP};then unset FTP_UP;else FTP_UP=-U;fi + if yesno ${TRANS_PROXY};then TRANS_PROXY=-t;else unset TRANS_PROXY;fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting gatling" + start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PID} \ +--name gatling --exec /usr/bin/gatling -- -T ${HTTP_TIMEOUT} -i ${IP} -p ${PORT} -P ${PREFETCH} \ +${VHOST} -c ${ROOTDIR} ${DIR_INDEXING} ${TRANS_PROXY} -u ${GATLING_UID} ${FTP} -T ${FTP_TIMEOUT} \ +${FTP_AUTH} ${FTP_UPLOADS} + eend $? +} + +stop() { + ebegin "Stopping gatling" + start-stop-daemon --quiet --stop --pidfile ${PID} + eend $? +} + +reload() { + if ! service_started "${SVCNAME}" ; then + eerror "${SVCNAME} isn't running" + return 1 + fi + + checkconfig || return 1 + + ebegin "Sending gatling the HUP signal" + start-stop-daemon --quiet --signal HUP --pidfile ${PID} + + ebegin "Restarting gatling server" + start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PID} \ +--name gatling --exec /usr/bin/gatling -- -T ${HTTP_TIMEOUT} -i ${IP} -p ${PORT} -P ${PREFETCH} \ +${VHOST} -c ${ROOTDIR} ${DIR_INDEXING} ${TRANS_PROXY} -u ${GATLING_UID} ${FTP} -T ${FTP_TIMEOUT} \ +${FTP_AUTH} ${FTP_UPLOADS} + eend $? +} diff --git a/www-servers/gatling/files/gentoo-vars.patch b/www-servers/gatling/files/gentoo-vars.patch deleted file mode 100644 index 349e9f81f4c9..000000000000 --- a/www-servers/gatling/files/gentoo-vars.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- GNUmakefile.org 2008-05-12 13:59:01.000000000 +0200 -+++ GNUmakefile 2008-05-12 15:04:17.000000000 +0200 -@@ -1,6 +1,6 @@ - #DEBUG=1 - ZLIB=1 --prefix=/opt/diet -+prefix=/usr - BINDIR=${prefix}/bin - MANDIR=${prefix}/man - man1dir=$(MANDIR)/man1 -@@ -14,8 +14,7 @@ - CROSS= - #CROSS=i686-mingw32- - CC=$(CROSS)gcc --CFLAGS=-pipe -Wall --LDFLAGS= -+CFLAGS+=-pipe -Wall -I/usr/include/libowfat - - path = $(subst :, ,$(PATH)) - diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet)) diff --git a/www-servers/gatling/gatling-0.12-r2.ebuild b/www-servers/gatling/gatling-0.12-r2.ebuild new file mode 100644 index 000000000000..be08408c7466 --- /dev/null +++ b/www-servers/gatling/gatling-0.12-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v 1.1 2012/03/22 00:39:53 patrick Exp $ + +EAPI="4" + +inherit eutils toolchain-funcs + +DESCRIPTION="High performance web server" +HOMEPAGE="http://www.fefe.de/gatling/" +SRC_URI="http://dl.fefe.de/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="ssl diet" + +DEPEND=">=dev-libs/libowfat-0.25 + diet? ( dev-libs/dietlibc ) + ssl? ( dev-libs/openssl )" +RDEPEND="${DEPEND}" + +src_prepare() { + rm Makefile # leaves GNUmakefile + epatch "${FILESDIR}/${P}-FLAGS.patch" +} + +src_compile() { + local diet_conf='DIET=env' + use diet && diet_conf= + + local targets=gatling + use ssl && targets+=' tlsgatling' + + emake CC="$(tc-getCC)" ${diet_conf} ${targets} \ + || die "emake ${targets} failed" +} + +src_install() { + doman gatling.1 || die "installing manpage failed" + + newconfd "${FILESDIR}/gatling.confd" gatling || die + newinitd "${FILESDIR}/gatling.initd-2" gatling || die + dodoc README.{ftp,http} || die "installing docs failed" + + dobin gatling || die "installing gatling binary failed" + use ssl && { + dobin tlsgatling || die "installing tlsgatling binary failed" + } +} + +pkg_setup() { + ebegin "Creating gatling user and group" + enewgroup gatling + enewuser ${PN} -1 -1 /var/www/localhost ${PN} +} |