[gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/, www-servers/gatling/

2022-09-20 Thread Sam James
commit: 81c8e794315833732c1e89eb18734b50b90c5276
Author: Arsen Arsenović  aarsen  me>
AuthorDate: Sun Sep 18 19:09:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 20 19:31:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c8e794

www-servers/gatling: add patches for Clang 16

Closes: https://bugs.gentoo.org/871495
Signed-off-by: Arsen Arsenović  aarsen.me>
Signed-off-by: Sam James  gentoo.org>

 ...-0001-try-alloca-socket-fix-Wimplicit-int.patch | 41 ++
 www-servers/gatling/gatling-0.16-r4.ebuild | 64 ++
 2 files changed, 105 insertions(+)

diff --git 
a/www-servers/gatling/files/gatling-0.16-r4-0001-try-alloca-socket-fix-Wimplicit-int.patch
 
b/www-servers/gatling/files/gatling-0.16-r4-0001-try-alloca-socket-fix-Wimplicit-int.patch
new file mode 100644
index ..4b22b7a5c13d
--- /dev/null
+++ 
b/www-servers/gatling/files/gatling-0.16-r4-0001-try-alloca-socket-fix-Wimplicit-int.patch
@@ -0,0 +1,41 @@
+From d1a28da112988112a37feb9050733717bfc176df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= 
+Date: Sun, 18 Sep 2022 19:48:16 +0200
+Subject: [PATCH] try{alloca,socket}: fix -Wimplicit-int
+
+This warning becomes fatal with Clang 16.
+---
+https://bugs.gentoo.org/871495
+ tryalloca.c | 2 +-
+ trysocket.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tryalloca.c b/tryalloca.c
+index c8927ab..b6e4f71 100644
+--- a/tryalloca.c
 b/tryalloca.c
+@@ -5,7 +5,7 @@
+ #include 
+ #endif
+ 
+-main() {
++int main() {
+   char* c=alloca(23);
+   return c!=NULL;
+ }
+diff --git a/trysocket.c b/trysocket.c
+index a01f395..381b794 100644
+--- a/trysocket.c
 b/trysocket.c
+@@ -6,7 +6,7 @@
+ #include 
+ #endif
+ 
+-main() {
++int main() {
+   int fd=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+   return fd!=-1;
+ }
+-- 
+2.35.1
+

diff --git a/www-servers/gatling/gatling-0.16-r4.ebuild 
b/www-servers/gatling/gatling-0.16-r4.ebuild
new file mode 100644
index ..5562859bec4a
--- /dev/null
+++ b/www-servers/gatling/gatling-0.16-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="High performance web server"
+HOMEPAGE="https://www.fefe.de/gatling/;
+SRC_URI="https://www.fefe.de/gatling/${P}.tar.xz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ssl diet"
+REQUIRED_USE="ssl? ( !diet )"
+
+DEPEND=">=dev-libs/libowfat-0.32-r2[diet=]
+   virtual/libcrypt:=
+   diet? ( dev-libs/dietlibc )
+   ssl? (
+   dev-libs/openssl:0=
+   )"
+RDEPEND="${DEPEND}
+   acct-group/gatling
+   acct-user/gatling
+   "
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.13-compile.patch"
+   "${FILESDIR}/${PN}-0.15-ar.patch"
+   
"${FILESDIR}/${PN}-0.16-r4-0001-try-alloca-socket-fix-Wimplicit-int.patch"
+)
+
+src_prepare() {
+   default
+   rm Makefile  # leaves us with GNUmakefile
+}
+
+src_compile() {
+   local DIET=
+   use diet && DIET='/usr/bin/diet'
+
+   local targets='gatling'
+   use ssl && targets+=' tlsgatling'
+
+   emake DIET="${DIET}" CC="$(tc-getCC)" \
+   CFLAGS="${CFLAGS} -I${ESYSROOT}/usr/include/libowfat" \
+   LDFLAGS="${LDFLAGS}" prefix=/usr ${targets}
+}
+
+src_install() {
+   doman gatling.1
+
+   newconfd "${FILESDIR}/gatling.confd" gatling
+   newinitd "${FILESDIR}/gatling.initd-3" gatling
+   dodoc README.{ftp,http}
+
+   dobin gatling
+   use ssl && {
+   dodoc README.tls
+   dobin tlsgatling
+   }
+}



[gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/, www-servers/gatling/

2020-11-26 Thread Sebastian Pipping
commit: c00abe05e686dff46288a9ae7c887d92b93c3cef
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Thu Nov 26 15:10:25 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Thu Nov 26 15:13:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00abe05

www-servers/gatling: Fix compile for GCC 10

Closes: https://bugs.gentoo.org/706396
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-3.0.0, Repoman-2.3.23

 www-servers/gatling/files/gatling-0.15-gcc10.patch | 38 ++
 www-servers/gatling/gatling-0.15.ebuild|  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/www-servers/gatling/files/gatling-0.15-gcc10.patch 
b/www-servers/gatling/files/gatling-0.15-gcc10.patch
new file mode 100644
index 000..446ea5cffde
--- /dev/null
+++ b/www-servers/gatling/files/gatling-0.15-gcc10.patch
@@ -0,0 +1,38 @@
+From b815fc02179e8f25a6bea2bc1ee7306ffea37258 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Thu, 26 Nov 2020 16:05:26 +0100
+Subject: [PATCH] Fix build with -fno-common or GCC 10
+
+---
+ dirfd.c | 1 +
+ dirfd.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dirfd.c b/dirfd.c
+index 6a0217e..792bd29 100644
+--- a/dirfd.c
 b/dirfd.c
+@@ -34,6 +34,7 @@ struct hashtable dc;
+ 
+ #ifdef __linux__
+ int rootwd;
++int ifd;
+ #endif
+ 
+ /* initialize a hashtable as empty */
+diff --git a/dirfd.h b/dirfd.h
+index cdfc4a3..a76c5d8 100644
+--- a/dirfd.h
 b/dirfd.h
+@@ -21,7 +21,7 @@
+  * given dir, and it will return the fd or -1 on error. */
+ 
+ #ifdef __linux__
+-int ifd;  /* inotify fd */
++extern int ifd;   /* inotify fd */
+ #endif
+ 
+ struct dircacheentry {
+-- 
+2.27.0
+

diff --git a/www-servers/gatling/gatling-0.15.ebuild 
b/www-servers/gatling/gatling-0.15.ebuild
index ba78c1bb2f6..e206f26d046 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-0.13-compile.patch"
+   "${FILESDIR}/${P}-gcc10.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/

2020-01-18 Thread Sebastian Pipping
commit: 83987709d1e866c6314eef26aff7e45fae6f921c
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Jan 10 08:46:28 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Jan 18 19:55:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83987709

www-servers/gatling: remove unused files

Closes: https://github.com/gentoo/gentoo/pull/14295
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Sebastian Pipping  gentoo.org>

 www-servers/gatling/files/gatling.initd   | 63 ---
 www-servers/gatling/files/gatling.initd-2 | 63 ---
 2 files changed, 126 deletions(-)

diff --git a/www-servers/gatling/files/gatling.initd 
b/www-servers/gatling/files/gatling.initd
deleted file mode 100644
index fadb1ce9d17..000
--- a/www-servers/gatling/files/gatling.initd
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Gatling high performance web server init script"
-opts="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
-   yesno ${TRANS_PROXY} && TRANS_PROXY=-t 
-}
-
-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/gatling.initd-2 
b/www-servers/gatling/files/gatling.initd-2
deleted file mode 100644
index 77f436009b3..000
--- a/www-servers/gatling/files/gatling.initd-2
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/openrc-run
-# 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 || 

[gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/

2019-11-23 Thread Sebastian Pipping
commit: 4adbfbc959bc6bea766108e26c4a002f5adb2c31
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Nov 21 14:33:24 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Nov 23 17:50:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4adbfbc9

www-servers/gatling: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/13730
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Sebastian Pipping  gentoo.org>

 www-servers/gatling/files/gatling-0.12-compile.patch | 20 
 1 file changed, 20 deletions(-)

diff --git a/www-servers/gatling/files/gatling-0.12-compile.patch 
b/www-servers/gatling/files/gatling-0.12-compile.patch
deleted file mode 100644
index db609836332..000
--- a/www-servers/gatling/files/gatling-0.12-compile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 GNUmakefile2012-04-10 04:31:14.505474482 +0200
-+++ GNUmakefile2012-04-10 04:31:53.821982958 +0200
-@@ -64,7 +64,7 @@
- acc: acc.c
-   $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) -lowfat
- 
--CC:=$(DIET) $(CC)
-+override CC:=$(DIET) $(CC)
- 
- pthreadbench: pthreadbench.o
-   $(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lpthread
-@@ -80,7 +80,7 @@
- $(OBJS) https.o gatling.o: gatling.h version.h gatling_features.h
- 
- tlsgatling: gatling.c ssl.o $(HTTPS_OBJS)
--  -$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS 
$(LDFLAGS) -lssl -lcrypto $(LDLIBS)
-+  $(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS 
$(LDFLAGS) -lssl -lcrypto $(LDLIBS)
- 
- gatling: gatling.o $(OBJS) md5lib
-   $(CC) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LDLIBS) `cat md5lib`



[gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/, www-servers/gatling/

2018-04-21 Thread Sebastian Pipping
commit: 149e967321483b5d1934b897a9ac7c18f715b1fa
Author: Marty E. Plummer  startmail  com>
AuthorDate: Fri Apr 20 14:36:34 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sat Apr 21 20:56:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149e9673

www-servers/gatling: epatch->PATCHES=()

Also reworked the patch to be -p1.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 www-servers/gatling/files/gatling-0.13-compile.patch | 4 ++--
 www-servers/gatling/gatling-0.15.ebuild  | 9 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/www-servers/gatling/files/gatling-0.13-compile.patch 
b/www-servers/gatling/files/gatling-0.13-compile.patch
index 7b4d44af9c0..a87a9541bec 100644
--- a/www-servers/gatling/files/gatling-0.13-compile.patch
+++ b/www-servers/gatling/files/gatling-0.13-compile.patch
@@ -1,5 +1,5 @@
 GNUmakefile2012-04-10 04:31:14.505474482 +0200
-+++ GNUmakefile2012-04-10 04:31:53.821982958 +0200
+--- a/GNUmakefile
 b/GNUmakefile
 @@ -64,7 +64,7 @@
  acc: acc.c
$(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) -lowfat

diff --git a/www-servers/gatling/gatling-0.15.ebuild 
b/www-servers/gatling/gatling-0.15.ebuild
index f2b75dd2546..b404cfd8a5c 100644
--- a/www-servers/gatling/gatling-0.15.ebuild
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,10 +23,13 @@ DEPEND=">=dev-libs/libowfat-0.25[diet=]
)"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-0.13-compile.patch"
+)
+
 src_prepare() {
+   default
rm Makefile  # leaves us with GNUmakefile
-   epatch "${FILESDIR}/${PN}-0.13-compile.patch"
-   eapply_user
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/, www-servers/gatling/

2017-08-27 Thread Sebastian Pipping
commit: 4221a4e4035cb01ca03fe4ceba8bde369f1806a6
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Aug 27 20:21:16 2017 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Aug 27 20:55:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4221a4e4

www-servers/gatling: 0.15

Also bump EAPI 6, use SSL URLs, and address init script Bashism

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/gatling/Manifest  |  1 +
 www-servers/gatling/files/gatling.initd-3 | 63 +++
 www-servers/gatling/gatling-0.15.ebuild   | 63 +++
 3 files changed, 127 insertions(+)

diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index fa8313c8501..d209c348c91 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,2 +1,3 @@
 DIST gatling-0.12.tar.bz2 99540 SHA256 
ffe4dbff99404eb80e6aac215fdf6bf8174355edc33dd1848a51fc1093296a7c SHA512 
50330e92576ce8002acaba9692cb9270ed2d794b1118e697193bd47beadac8ae75a8e2e0b802923172961d74e50cbe114b5e39c083b79a975c0a1bf4c86cab0a
 WHIRLPOOL 
5f169bfc0e91281833b543c050daaa5fe9f6f419e5a0a3b03f6853cb40468b375df849cfc4b036544131e1cefa97ccdde377629499f0a010cb56add33881
 DIST gatling-0.13.tar.bz2 108128 SHA256 
b42145fdf7b66602fa8bc64661c2762172f6d33dbd9d53efebf821cd81e89245 SHA512 
b9fa604aa8bb8c5d40d9c3eaaa536ed5e73d0ed93eccb41ca4744316ad893dc6fe92fe2c1f0247de82d4eda63b0ab7ab338355d9963fb58f23d39a2c678a1db8
 WHIRLPOOL 
c9d90bec09cf07bc506bd84491d550834d48e0e3b19b2e7095ab43a4a3cd7a182fc1660d5a5cef878f1e1a7b3d367c5e76efc75df77269ab89d64c73c2af7a59
+DIST gatling-0.15.tar.xz 121804 SHA256 
6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4 SHA512 
b76d220a0644f1e6e7ea966a4eff409964c564fc4a31c4efdb764e5f7b5857bc58c26bc31e860fe35df932cbd60fb2b0f4f21c75cb5aa56427e8a2a453684716
 WHIRLPOOL 
74d4613ca83500d11e81fc4a59e4a1749d0cac7baf1da16d7cbfb4573e3d94bddd1adc7f563de61942f46dd1e5dc88b19f498182eb63919ff71773ef31a19a38

diff --git a/www-servers/gatling/files/gatling.initd-3 
b/www-servers/gatling/files/gatling.initd-3
new file mode 100644
index 000..33c5e5a3095
--- /dev/null
+++ b/www-servers/gatling/files/gatling.initd-3
@@ -0,0 +1,63 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 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/gatling-0.15.ebuild 
b/www-servers/gatling/gatling-0.15.ebuild
new file mode 100644
index 000..f2b75dd2546
--- /dev/null
+++ b/www-servers/gatling/gatling-0.15.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="High performance web server"
+HOMEPAGE="https://www.fefe.de/gatling/;
+SRC_URI="https://www.fefe.de/gatling/${P}.tar.xz;

[gentoo-commits] repo/gentoo:master commit in: www-servers/gatling/files/

2017-02-16 Thread Michael Palimaka
commit: 81db6bd2c75a31ea907eceb6534533cd540fb355
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Feb 15 16:53:30 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Feb 16 11:11:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81db6bd2

www-servers/gatling: remove unused patch

 www-servers/gatling/files/gatling-0.12-FLAGS.patch | 40 --
 1 file changed, 40 deletions(-)

diff --git a/www-servers/gatling/files/gatling-0.12-FLAGS.patch 
b/www-servers/gatling/files/gatling-0.12-FLAGS.patch
deleted file mode 100644
index c7bd1fe4ce..00
--- a/www-servers/gatling/files/gatling-0.12-FLAGS.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -NrU5 gatling-0.12.original/GNUmakefile gatling-0.12/GNUmakefile
 gatling-0.12.original/GNUmakefile  2010-05-30 16:58:29.0 -0600
-+++ gatling-0.12/GNUmakefile   2010-05-30 17:03:21.0 -0600
-@@ -1,8 +1,8 @@
- #DEBUG=1
- ZLIB=1
--prefix=/opt/diet
-+prefix=/usr
- BINDIR=${prefix}/bin
- MANDIR=${prefix}/man
- man1dir=$(MANDIR)/man1
- 
- TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling \
-@@ -14,12 +14,12 @@
- all: $(ALLTARGETS)
- 
- CROSS=
- #CROSS=i686-mingw32-
- CC=$(CROSS)gcc
--CFLAGS=-pipe -Wall
--LDFLAGS=
-+CFLAGS+=-pipe -Wall -I/usr/include/libowfat
-+LDFLAGS+=
- 
- path = $(subst :, ,$(PATH))
- diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
- ifeq ($(strip $(diet_path)),)
- ifneq ($(wildcard /opt/diet/bin/diet),)
-@@ -37,11 +37,10 @@
- ifneq ($(DEBUG),)
- CFLAGS+=-g
- LDFLAGS+=-g
- else
- CFLAGS+=-O2 -fomit-frame-pointer -I/usr/local/include
--LDFLAGS+=-s
- ifneq ($(DIET),)
- DIET+=-Os
- endif
- endif
-