| 1 |
patrick 11/12/23 03:27:32 |
| 2 |
|
| 3 |
Added: siege-2.70-gentoo.diff |
| 4 |
Log: |
| 5 |
Bump for #386895, should fix #337619 too, thanks to Michael Kensington |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-benchmarks/siege/files/siege-2.70-gentoo.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/siege/files/siege-2.70-gentoo.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-benchmarks/siege/files/siege-2.70-gentoo.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: siege-2.70-gentoo.diff |
| 16 |
=================================================================== |
| 17 |
The bundled acinclude.m4 includeso ld libtool macros that |
| 18 |
are breaking build, and AC_PROG_SHELL is the only thing |
| 19 |
from it that can't be autogenerated. Since all it does |
| 20 |
is check for a POSIX shell, just avoid using it. |
| 21 |
--- configure.in |
| 22 |
+++ configure.in |
| 23 |
@@ -44,7 +44,6 @@ |
| 24 |
dnl Program support |
| 25 |
dnl |
| 26 |
AC_PATH_PROG( PERL, perl, false ) |
| 27 |
-AC_PROG_SHELL |
| 28 |
AC_PROG_MAKE_SET |
| 29 |
AC_PROG_INSTALL |
| 30 |
case "$host_os" in |
| 31 |
@@ -405,7 +404,7 @@ |
| 32 |
dnl |
| 33 |
AC_OUTPUT_COMMANDS([ |
| 34 |
infile=utils/siege2csv.in |
| 35 |
- outfile=utils/siege2csv.pl |
| 36 |
+ outfile=utils/siege2csv |
| 37 |
rm -f $outfile |
| 38 |
sed -e "s|%_PREFIX%|$bindir|" \ |
| 39 |
-e "s|%_PERL%|$LREP|" \ |
| 40 |
|
| 41 |
--- src/Makefile.am |
| 42 |
+++ src/Makefile.am |
| 43 |
@@ -28,7 +28,7 @@ |
| 44 |
|
| 45 |
AM_CFLAGS = $(PTHREAD_CFLAGS) $(WARN_CFLAGS) $(SSL_CFLAGS) |
| 46 |
|
| 47 |
-LDFLAGS = $(SSL_LDFLAGS) $(PTHREAD_LDFLAGS) |
| 48 |
+LDFLAGS += $(SSL_LDFLAGS) $(PTHREAD_LDFLAGS) |
| 49 |
|
| 50 |
LIBS = $(SSL_LIBS) |
| 51 |
|
| 52 |
Use of \b causes the T in "Transactions" to be displayed |
| 53 |
on the last column of the previous line. |
| 54 |
--- src/main.c |
| 55 |
+++ src/main.c |
| 56 |
@@ -529,7 +529,7 @@ |
| 57 |
fprintf(stderr, "%s aborted due to excessive socket failure; you\n", program_name); |
| 58 |
fprintf(stderr, "can change the failure threshold in $HOME/.%src\n", program_name); |
| 59 |
} |
| 60 |
- fprintf(stderr, "\bTransactions:\t\t%12u hits\n", data_get_count(D)); |
| 61 |
+ fprintf(stderr, "Transactions:\t\t%12u hits\n", data_get_count(D)); |
| 62 |
fprintf(stderr, "Availability:\t\t%12.2f %%\n", data_get_count(D)==0 ? 0 : |
| 63 |
(double)data_get_count(D) / |
| 64 |
(data_get_count(D)+my.failed) |
| 65 |
|
| 66 |
--- utils/Makefile.am |
| 67 |
+++ utils/Makefile.am |
| 68 |
@@ -25,7 +25,7 @@ |
| 69 |
WARN_CFLAGS = @WARN_CFLAGS@ |
| 70 |
AM_CFLAGS = $(WARN_CFLAGS) |
| 71 |
|
| 72 |
-SIEGE_UTILITIES = bombardment siege2csv.pl siege.config |
| 73 |
+SIEGE_UTILITIES = bombardment siege2csv siege.config |
| 74 |
|
| 75 |
DISTCLEANFILES = $(SIEGE_UTILITIES) |
| 76 |
|
| 77 |
--- doc/Makefile.am |
| 78 |
+++ doc/Makefile.am |
| 79 |
@@ -46,35 +46,6 @@ |
| 80 |
|
| 81 |
URLSTXT = $(sysconfdir)/urls.txt |
| 82 |
|
| 83 |
-install-exec-hook: |
| 84 |
- @if test -f $(SIEGERC); then \ |
| 85 |
- if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \ |
| 86 |
- else \ |
| 87 |
- echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \ |
| 88 |
- $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \ |
| 89 |
- echo "#####################################################"; \ |
| 90 |
- echo "WARNING: File $(SIEGERC) already exists."; \ |
| 91 |
- echo " A new resource file has been installed as"; \ |
| 92 |
- echo " $(SIEGERC).new. You may want to"; \ |
| 93 |
- echo " consider using the newer version in order to"; \ |
| 94 |
- echo " take advantage of any new features."; \ |
| 95 |
- echo "#####################################################"; \ |
| 96 |
- fi; \ |
| 97 |
- else \ |
| 98 |
- $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \ |
| 99 |
- fi |
| 100 |
- @if test -f $(URLSTXT); then \ |
| 101 |
- if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \ |
| 102 |
- else \ |
| 103 |
- echo "WARNING: File $(URLSTXT) already exists."; \ |
| 104 |
- echo " It was NOT replaced with this installation."; \ |
| 105 |
- fi; \ |
| 106 |
- else \ |
| 107 |
- $(mkinstalldirs) $(sysconfdir); \ |
| 108 |
- $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \ |
| 109 |
- fi |
| 110 |
- |
| 111 |
- |
| 112 |
uninstall: |
| 113 |
rm -f $(SIEGERC) |
| 114 |
|
| 115 |
bug 111057 - siege.config utility uses ${} which gets |
| 116 |
interpreted by bash sending the contents to stderr |
| 117 |
instead of ${HOME}/.siegerc |
| 118 |
--- doc/siegerc.in |
| 119 |
+++ doc/siegerc.in |
| 120 |
@@ -9,11 +9,11 @@ |
| 121 |
# Variable declarations. You can set variables here |
| 122 |
# for use in the directives below. Example: |
| 123 |
# PROXY = proxy.joedog.org |
| 124 |
-# Reference variables inside ${} or $(), example: |
| 125 |
+# Reference variables inside \${} or $(), example: |
| 126 |
# proxy-host = ${PROXY} |
| 127 |
# You can also reference ENVIRONMENT variables without |
| 128 |
# actually declaring them, example: |
| 129 |
-# logfile = $(HOME)/var/siege.log |
| 130 |
+# logfile = \$(HOME)/var/siege.log |
| 131 |
|
| 132 |
# |
| 133 |
# Signify verbose mode, true turns on verbose output |
Archives