Updated www/siege to version 4.0.4. Pkgsrc changelog : * Some files do not exist anymore, so they were removed from installation * Fixed compilation issue about signals Some of the upstream changes : * an HTML parser : pages are now parsed for additional elements (images, js...) that are also requested ; * improved memory management ; * logging to a file is now disabled by default ; * colored output can be disabled in the config file ; * implement disable cache option. Full changelog available here : https://github.com/JoeDog/siege/blob/v4.0.4/ChangeLogdiff -r1.6 -r1.7 pkgsrc/www/siege/Makefile
(nils)
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.6 2019/05/23 19:23:21 rillig Exp $ | 1 | # $NetBSD: Makefile,v 1.7 2019/08/18 20:32:59 nils Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= siege-3.1.3 | 4 | DISTNAME= siege-4.0.4 | |
5 | PKGREVISION= 2 | |||
6 | CATEGORIES= www | 5 | CATEGORIES= www | |
7 | MASTER_SITES= http://download.joedog.org/siege/ | 6 | MASTER_SITES= http://download.joedog.org/siege/ | |
8 | 7 | |||
9 | MAINTAINER= nils@NetBSD.org | 8 | MAINTAINER= nils@NetBSD.org | |
10 | HOMEPAGE= http://www.joedog.org/JoeDog/Siege | 9 | HOMEPAGE= http://www.joedog.org/JoeDog/Siege | |
11 | COMMENT= Website/webserver regression testing utility | 10 | COMMENT= Website/webserver regression testing utility | |
12 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
13 | 12 | |||
14 | GNU_CONFIGURE= yes | 13 | GNU_CONFIGURE= yes | |
15 | 14 | |||
16 | USE_TOOLS+= autoconf | 15 | USE_TOOLS+= autoconf | |
17 | 16 | |||
18 | .include "options.mk" | 17 | .include "options.mk" | |
@@ -35,22 +34,17 @@ CONFIGURE_ENV+= PERL=${PERL5:Q} | @@ -35,22 +34,17 @@ CONFIGURE_ENV+= PERL=${PERL5:Q} | |||
35 | 34 | |||
36 | INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} | 35 | INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} | |
37 | INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q} | 36 | INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q} | |
38 | NOT_FOR_PLATFORM+= SunOS-*-* | 37 | NOT_FOR_PLATFORM+= SunOS-*-* | |
39 | 38 | |||
40 | pre-configure: | 39 | pre-configure: | |
41 | cd ${WRKSRC} && autoconf | 40 | cd ${WRKSRC} && autoconf | |
42 | 41 | |||
43 | post-install: | 42 | post-install: | |
44 | ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${DOCDIR}/AUTHORS | 43 | ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${DOCDIR}/AUTHORS | |
45 | ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR}/COPYING | 44 | ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR}/COPYING | |
46 | ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${DOCDIR}/ChangeLog | 45 | ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${DOCDIR}/ChangeLog | |
47 | ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}/INSTALL | 46 | ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}/INSTALL | |
48 | ${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${DESTDIR}${DOCDIR}/KNOWNBUGS | |||
49 | #${INSTALL_DATA} ${WRKSRC}/MACHINES ${DESTDIR}${DOCDIR}/MACHINES | |||
50 | ${INSTALL_DATA} ${WRKSRC}/NEWS ${DESTDIR}${DOCDIR}/NEWS | |||
51 | ${INSTALL_DATA} ${WRKSRC}/PLATFORM ${DESTDIR}${DOCDIR}/PLATFORM | 47 | ${INSTALL_DATA} ${WRKSRC}/PLATFORM ${DESTDIR}${DOCDIR}/PLATFORM | |
52 | ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${DOCDIR}/README.md | 48 | ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${DOCDIR}/README.md | |
53 | ${INSTALL_DATA} ${WRKSRC}/README.https ${DESTDIR}${DOCDIR}/README.https | |||
54 | #${INSTALL_DATA} ${WRKSRC}/README.solaris ${DESTDIR}${DOCDIR}/README.solaris | |||
55 | 49 | |||
56 | .include "../../mk/bsd.pkg.mk" | 50 | .include "../../mk/bsd.pkg.mk" |
@@ -1,22 +1,17 @@ | @@ -1,22 +1,17 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2017/08/14 15:24:58 jlam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2019/08/18 20:32:59 nils Exp $ | |
2 | bin/bombardment | 2 | bin/bombardment | |
3 | bin/siege | 3 | bin/siege | |
4 | bin/siege.config | 4 | bin/siege.config | |
5 | bin/siege2csv.pl | 5 | bin/siege2csv.pl | |
6 | man/man1/bombardment.1 | 6 | man/man1/bombardment.1 | |
7 | man/man1/siege.1 | 7 | man/man1/siege.1 | |
8 | man/man1/siege.config.1 | 8 | man/man1/siege.config.1 | |
9 | man/man1/siege2csv.1 | 9 | man/man1/siege2csv.1 | |
10 | man/man5/urls_txt.5 | |||
11 | man/man7/layingsiege.7 | |||
12 | share/doc/siege/AUTHORS | 10 | share/doc/siege/AUTHORS | |
13 | share/doc/siege/COPYING | 11 | share/doc/siege/COPYING | |
14 | share/doc/siege/ChangeLog | 12 | share/doc/siege/ChangeLog | |
15 | share/doc/siege/INSTALL | 13 | share/doc/siege/INSTALL | |
16 | share/doc/siege/KNOWNBUGS | |||
17 | share/doc/siege/NEWS | |||
18 | share/doc/siege/PLATFORM | 14 | share/doc/siege/PLATFORM | |
19 | share/doc/siege/README.https | |||
20 | share/doc/siege/README.md | 15 | share/doc/siege/README.md | |
21 | share/examples/siege/siegerc | 16 | share/examples/siege/siegerc | |
22 | share/examples/siege/urls.txt | 17 | share/examples/siege/urls.txt |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2015/12/04 22:31:19 nils Exp $ | 1 | $NetBSD: distinfo,v 1.4 2019/08/18 20:32:59 nils Exp $ | |
2 | 2 | |||
3 | SHA1 (siege-3.1.3.tar.gz) = 32dcc7fb6fa0caf134694878c255d5066bf20917 | 3 | SHA1 (siege-4.0.4.tar.gz) = 489bcc89799146631898612c8a39030b98cfe310 | |
4 | RMD160 (siege-3.1.3.tar.gz) = 23f056ea6ef790178d97f76507e8fa53585b3e39 | 4 | RMD160 (siege-4.0.4.tar.gz) = 41b07d04f96e4f92c7aa66351467b07ca7cef1fd | |
5 | SHA512 (siege-3.1.3.tar.gz) = 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b | 5 | SHA512 (siege-4.0.4.tar.gz) = a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573 | |
6 | Size (siege-3.1.3.tar.gz) = 527862 bytes | 6 | Size (siege-4.0.4.tar.gz) = 523102 bytes | |
7 | SHA1 (patch-src_init.c) = 88ee2383af55c71a647ef778b728d967a6199fb2 |
$NetBSD: patch-src_init.c,v 1.1 2019/08/18 20:32:59 nils Exp $
Signals are defined in signal.h in *BSD
--- src/init.c.orig 2017-09-11 17:36:08.000000000 +0000
+++ src/init.c
@@ -39,7 +39,10 @@
#include <unistd.h>
#include <errno.h>
#include <stdlib.h>
-
+/* Signals are defined in signal.h in *BSD */
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#include <signal.h>
+#endif
#define LINESZ 1024
int