diff --git a/.gitignore b/.gitignore index 49cbb46..32d3ce3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/haproxy-1.5-dev22.tar.gz +SOURCES/haproxy-1.5.2.tar.gz diff --git a/.haproxy.metadata b/.haproxy.metadata index 0dbeb84..b5c9af9 100644 --- a/.haproxy.metadata +++ b/.haproxy.metadata @@ -1 +1 @@ -ae3ee9c15e2fba7724ca752d293bf047a16eb313 SOURCES/haproxy-1.5-dev22.tar.gz +d8668cbbf58524a6b4c6f5c434cc76b531235c8e SOURCES/haproxy-1.5.2.tar.gz diff --git a/SOURCES/halog-unused-variables.patch b/SOURCES/halog-unused-variables.patch new file mode 100644 index 0000000..a00e616 --- /dev/null +++ b/SOURCES/halog-unused-variables.patch @@ -0,0 +1,135 @@ +--- contrib/halog/halog.c.orig 2014-06-27 14:22:26.464296394 -0500 ++++ contrib/halog/halog.c 2014-06-27 14:23:07.915599498 -0500 +@@ -462,7 +462,7 @@ int convert_date(const char *field) + { + unsigned int h, m, s, ms; + unsigned char c; +- const char *b, *e; ++ const char *e; + + h = m = s = ms = 0; + e = field; +@@ -477,7 +477,6 @@ int convert_date(const char *field) + } + + /* hour + ':' */ +- b = e; + while (1) { + c = *(e++) - '0'; + if (c > 9) +@@ -488,7 +487,6 @@ int convert_date(const char *field) + goto out_err; + + /* minute + ':' */ +- b = e; + while (1) { + c = *(e++) - '0'; + if (c > 9) +@@ -499,7 +497,6 @@ int convert_date(const char *field) + goto out_err; + + /* second + '.' or ']' */ +- b = e; + while (1) { + c = *(e++) - '0'; + if (c > 9) +@@ -512,7 +509,6 @@ int convert_date(const char *field) + /* if there's a '.', we have milliseconds */ + if (c == (unsigned char)('.' - '0')) { + /* millisecond second + ']' */ +- b = e; + while (1) { + c = *(e++) - '0'; + if (c > 9) +@@ -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) + { +- const char *b, *e, *p, *time_field, *accept_field, *source_field; ++ const char *b, *p, *time_field, *accept_field, *source_field; + const char *filter_term_code_name = NULL; + const char *output_file = NULL; +- int f, last, err; ++ int f, last; + struct timer *t = NULL; + struct eb32_node *n; + struct url_stat *ustat = NULL; +@@ -941,7 +934,7 @@ int main(int argc, char **argv) + } + } + +- e = field_stop(time_field + 1); ++ field_stop(time_field + 1); + /* we have field TIME_FIELD in [time_field]..[e-1] */ + p = time_field; + f = 0; +@@ -965,17 +958,15 @@ int main(int argc, char **argv) + } + } + +- e = field_stop(time_field + 1); ++ field_stop(time_field + 1); + /* we have field TIME_FIELD in [time_field]..[e-1], let's check only the response time */ + + p = time_field; +- err = 0; + f = 0; + while (!SEP(*p)) { + tps = str2ic(p); + if (tps < 0) { + tps = -1; +- err = 1; + } + if (++f == 4) + break; +@@ -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) + { + struct timer *t2; +- const char *e, *p; ++ const char *p; + int f, err, array[5]; + + if (!time_field) { +@@ -1712,7 +1703,7 @@ void filter_graphs(const char *accept_fi + } + } + +- e = field_stop(time_field + 1); ++ field_stop(time_field + 1); + /* we have field TIME_FIELD in [time_field]..[e-1] */ + + p = time_field; diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec index eebc267..b2de127 100644 --- a/SPECS/haproxy.spec +++ b/SPECS/haproxy.spec @@ -6,23 +6,25 @@ %global _hardened_build 1 -%define devtag dev22 - Name: haproxy -Version: 1.5 -Release: 0.3.%{devtag}%{?dist} +Version: 1.5.2 +Release: 2%{?dist} Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments Group: System Environment/Daemons License: GPLv2+ URL: http://haproxy.1wt.eu/ -Source0: http://haproxy.1wt.eu/download/1.4/src/haproxy-%{version}-%{devtag}.tar.gz +Source0: http://haproxy.1wt.eu/download/1.5/src/haproxy-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.cfg Source3: %{name}.logrotate +Patch0: halog-unused-variables.patch + BuildRequires: pcre-devel +BuildRequires: zlib-devel +BuildRequires: openssl-devel BuildRequires: systemd-units Requires(pre): shadow-utils @@ -44,8 +46,8 @@ availability environments. Indeed, it can: %prep -%setup -q -n haproxy-%{version}-%{devtag} - +%setup -q +%patch0 -p0 %build # No configure script is present, it is all done via make flags @@ -58,7 +60,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -make %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_PCRE=1 ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" +make %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 ${regparm_opts} ADDINC="%{optflags}" USE_LINUX_TPROXY=1 ADDLIB="%{__global_ldflags}" # build the halog contrib program. pushd contrib/halog @@ -133,8 +135,19 @@ exit 0 %{_mandir}/man1/%{name}.1.gz %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home} - %changelog +* Thu Jul 31 2014 Ryan O'Hara - 1.5.2-2 +- Bump release number (#1120228) + +* Thu Jul 17 2014 Ryan O'Hara - 1.5.2-1 +- Update to stable release 1.5.2 (#1120228) + +* Tue Jul 17 2014 Ryan O'Hara - 1.5.1-2 +- Build with openssl and zlib (#1120673) + +* Thu Jul 17 2014 Ryan O'Hara - 1.5.1-1 +- Update to stable release 1.5.1 (#1120228) + * Fri Feb 28 2014 Ryan O'Hara - 1.5-0.3.dev22 - Use haproxy-systemd-wrapper in service file (#1067060)