rpms/haproxy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.5.3

Browse Source
This commit is contained in:
Ryan O'Hara 2014-07-25 15:28:24 -05:00
parent 9647c11f53
commit 6b82d1bdce
4 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ haproxy-1.4.8.tar.gz
/haproxy-1.5.0.tar.gz /haproxy-1.5.0.tar.gz
/haproxy-1.5.1.tar.gz /haproxy-1.5.1.tar.gz
/haproxy-1.5.2.tar.gz /haproxy-1.5.2.tar.gz
/haproxy-1.5.3.tar.gz

57
halog-unused-variables.patch
View File

@ -1,6 +1,6 @@
--- contrib/halog/halog.c.orig 2014-02-02 18:41:29.000000000 -0500 --- contrib/halog/halog.c.orig 2014-07-25 01:56:07.000000000 -0500
+++ contrib/halog/halog.c 2014-02-21 22:08:19.265000000 -0500 +++ contrib/halog/halog.c 2014-07-25 15:24:56.996876765 -0500
@@ -456,7 +456,7 @@ @@ -462,7 +462,7 @@ int convert_date(const char *field)
{ {
unsigned int h, m, s, ms; unsigned int h, m, s, ms;
unsigned char c; unsigned char c;
@ -9,7 +9,7 @@
h = m = s = ms = 0; h = m = s = ms = 0;
e = field; e = field;
@@ -471,7 +471,6 @@ @@ -477,7 +477,6 @@ int convert_date(const char *field)
} }
/* hour + ':' */ /* hour + ':' */
@ -17,7 +17,7 @@
while (1) { while (1) {
c = *(e++) - '0'; c = *(e++) - '0';
if (c > 9) if (c > 9)
@@ -482,7 +481,6 @@ @@ -488,7 +487,6 @@ int convert_date(const char *field)
goto out_err; goto out_err;
/* minute + ':' */ /* minute + ':' */
@ -25,7 +25,7 @@
while (1) { while (1) {
c = *(e++) - '0'; c = *(e++) - '0';
if (c > 9) if (c > 9)
@@ -493,7 +491,6 @@ @@ -499,7 +497,6 @@ int convert_date(const char *field)
goto out_err; goto out_err;
/* second + '.' or ']' */ /* second + '.' or ']' */
@ -33,7 +33,7 @@
while (1) { while (1) {
c = *(e++) - '0'; c = *(e++) - '0';
if (c > 9) if (c > 9)
@@ -506,7 +503,6 @@ @@ -512,7 +509,6 @@ int convert_date(const char *field)
/* if there's a '.', we have milliseconds */ /* if there's a '.', we have milliseconds */
if (c == (unsigned char)('.' - '0')) { if (c == (unsigned char)('.' - '0')) {
/* millisecond second + ']' */ /* millisecond second + ']' */
@ -41,7 +41,40 @@
while (1) { while (1) {
c = *(e++) - '0'; c = *(e++) - '0';
if (c > 9) if (c > 9)
@@ -529,10 +525,10 @@ @@ -535,7 +531,7 @@ int convert_date_to_timestamp(const char
{
unsigned int d, mo, y, h, m, s;
unsigned char c;
- const char *b, *e;
+ const char *e;
time_t rawtime;
static struct tm * timeinfo;
static int last_res;
@@ -622,7 +618,6 @@ int convert_date_to_timestamp(const char
}
/* hour + ':' */
- b = e;
while (1) {
c = *(e++) - '0';
if (c > 9)
@@ -633,7 +628,6 @@ int convert_date_to_timestamp(const char
goto out_err;
/* minute + ':' */
- b = e;
while (1) {
c = *(e++) - '0';
if (c > 9)
@@ -644,7 +638,6 @@ int convert_date_to_timestamp(const char
goto out_err;
/* second + '.' or ']' */
- b = e;
while (1) {
c = *(e++) - '0';
if (c > 9)
@@ -686,10 +679,10 @@ void truncated_line(int linenum, const c
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -54,7 +87,7 @@
struct timer *t = NULL; struct timer *t = NULL;
struct eb32_node *n; struct eb32_node *n;
struct url_stat *ustat = NULL; struct url_stat *ustat = NULL;
@@ -761,7 +757,7 @@ @@ -941,7 +934,7 @@ int main(int argc, char **argv)
} }
} }
@ -63,7 +96,7 @@
/* we have field TIME_FIELD in [time_field]..[e-1] */ /* we have field TIME_FIELD in [time_field]..[e-1] */
p = time_field; p = time_field;
f = 0; f = 0;
@@ -785,17 +781,15 @@ @@ -965,17 +958,15 @@ int main(int argc, char **argv)
} }
} }
@ -82,7 +115,7 @@
} }
if (++f == 4) if (++f == 4)
break; break;
@@ -1521,7 +1515,7 @@ @@ -1701,7 +1692,7 @@ void filter_count_ip(const char *source_
void filter_graphs(const char *accept_field, const char *time_field, struct timer **tptr) void filter_graphs(const char *accept_field, const char *time_field, struct timer **tptr)
{ {
struct timer *t2; struct timer *t2;
@ -91,7 +124,7 @@
int f, err, array[5]; int f, err, array[5];
if (!time_field) { if (!time_field) {
@@ -1532,7 +1526,7 @@ @@ -1712,7 +1703,7 @@ void filter_graphs(const char *accept_fi
} }
} }

5
haproxy.spec
View File

@ -7,7 +7,7 @@
%global _hardened_build 1 %global _hardened_build 1
Name: haproxy Name: haproxy
Version: 1.5.2 Version: 1.5.3
Release: 1%{?dist} Release: 1%{?dist}
Summary: HAProxy reverse proxy for high availability environments Summary: HAProxy reverse proxy for high availability environments
@ -135,6 +135,9 @@ exit 0
%attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home} %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
%changelog %changelog
* Fri Jul 25 2014 Ryan O'Hara <rohara@redhat.com> - 1.5.3-1
- Update to 1.5.3
* Tue Jul 15 2014 Ryan O'Hara <rohara@redhat.com> - 1.5.2-1 * Tue Jul 15 2014 Ryan O'Hara <rohara@redhat.com> - 1.5.2-1
- Update to 1.5.2 - Update to 1.5.2

2
sources
View File

@ -1 +1 @@
e854fed32ea751d6db7f366cb910225a haproxy-1.5.2.tar.gz e999a547d57445d5a5ab7eb6a06df9a1 haproxy-1.5.3.tar.gz