diff --git a/.gear/tags/39e3fd9735af72d41939c5926d33778f0f497e07 b/.gear/tags/39e3fd9735af72d41939c5926d33778f0f497e07 new file mode 100644 index 000000000..7bff45907 --- /dev/null +++ b/.gear/tags/39e3fd9735af72d41939c5926d33778f0f497e07 @@ -0,0 +1,22 @@ +object 987a4e248bbccf4bffe955b27ccfbcbb626348c2 +type commit +tag v2.6.5 +tagger Willy Tarreau 1662172851 +0200 + +HAProxy 2.6.5 +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJjEr6zAAoJEE44bZycYXAv6OUP/i2DSdRd1PKNHdn1QdQ++Be5 +PHwxZ/0k+IZPLrGeGjcA6lsJUXogGgspW64SwDAcvTPCSfBeL6uRCYZZ+1nyhYB1 +hx0e/4d7SwMTdg4VvcPkEl0jNi4khbDJ+VkTQc/kskHDJEXZtV6kgkxGy+oPDrG8 ++OvrasOwhN+ZAnqQ+IlP5F/mx6cy2dyGg9fWxW+k63SE4uyl7rbalyoeRelc0USP +fFFqyt05KqZwLuH2dDs8Tled+D7rwCfdjy69/EIGQIq/DbmMu60hlwGKZSwXIWsr +3Uea4HB1HuNsK0pIjk3fO1xbVykDsFkrr+7Ca3lkfuEORfAW42yMh+9IvB5f85WY +/qsxHIVmjh16h5V0yNU1UeUe1ztjxcKVmkaaIvpsqJ/XvCAw4bjW2+a4ZyfmTzlQ +y4S8zBqb5nUuznpkL2v+QBuTTl2+FQ8HrVISt/h43n/TsILYFgs3kcUJco8gSZGw +Vmfi+Tv7St9N1zBWyd3hEeAqmDupVgT1PPEYP22J6efPqcPYW0X0EIYESgAvzj7i +cHRKwzAPlJE1pjvuVv/BC7QZGtsJCy/8Wgi7ExVQX8ib7pFPDmXUUrgDCWKqMWAY +PHS+XK4YlqwPXp7XlId8DH6/rFzMYytq2ttJ5+5rFWs4ivZ1DT1S7a2mNndZyH8R +O06/cQ9+Bd89RnyiHYro +=t2dP +-----END PGP SIGNATURE----- diff --git a/.gear/tags/ac0aa7cb8a6ab923f78f1e246598e04d5dbaefe3 b/.gear/tags/ac0aa7cb8a6ab923f78f1e246598e04d5dbaefe3 deleted file mode 100644 index 2d8cbc08f..000000000 --- a/.gear/tags/ac0aa7cb8a6ab923f78f1e246598e04d5dbaefe3 +++ /dev/null @@ -1,22 +0,0 @@ -object 53945bf8cde846893bfb9a32e31b40ca9eab4310 -type commit -tag v2.3.9 -tagger Willy Tarreau 1617122287 +0200 - -HAProxy 2.3.9 ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJgY1PvAAoJEE44bZycYXAvpQsQAIf8z8a+lmX0ymNNo42CFmYa -ccP4Jp+EKtlh9h34+iazATjOYg2RpWNhZE/5s4uHfbUlM2wjUAsETvMm4Wa42XYq -mlb7H7j6UPwmxY4zs5trlTT26Zr9ypaXWQhLd3f8t3jEFBp5/HrsP35K+WjSq1EC -rlzMbNfgSCnilucLbWz3FgByMnG5B9a5W7vQkkpFJ3Rt3nU6Ykedgibp6x3C7IH9 -J8UUoD4eEjuWqNdoSRcP+st2aKWphwxyoUfwtZ9BerR83Qls9onwbuGEnln12GuL -ym9BOaQfZzKL36LVftvU+GKIPWT/3vwlqLXhZCD4G9l82SNz/jl1BXYSNAnJSmzD -m7FE3Gb5rnxxyDN4gYf7ENlydMLrIj9PwDuBB1TWTlykt2vutjFDrIgDEEI21ShF -s+eNbe1sNV1dD2TSs4ZUuWkY/0CIotX6AT6YrSiBPADRVEo8b47meTLPLa3shYhP -F6IYgVx3sK3qpYhYvRm+jIDLLbiMk3z/AMoQrKRq/wShfWdOblLgoDsSzIWnSbaJ -CqHP/FlKbQpYZPLNwjFE28zRM3940OVUTJDqPApoWMHwU7BCL0rNnqRpzdF7EzQ+ -Ic2ZomeOMCqk6HnZmntaBsL5xIZgm7HqNPkJqy4DXegALZpvwEAxmSd/9fCt3i9X -tFvpvjMjA8C0M+8bshK0 -=jL75 ------END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list index d232c6db0..abe81384b 100644 --- a/.gear/tags/list +++ b/.gear/tags/list @@ -1 +1 @@ -ac0aa7cb8a6ab923f78f1e246598e04d5dbaefe3 v2.3.9 +39e3fd9735af72d41939c5926d33778f0f497e07 v2.6.5 diff --git a/haproxy.spec b/haproxy.spec index 6bb2658a7..e0b62a17f 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -7,7 +7,7 @@ %def_enable lua Name: haproxy -Version: 2.3.9 +Version: 2.6.5 Release: alt1 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments @@ -53,13 +53,12 @@ regparm_opts="USE_REGPARM=1" addlib_opts=ADDLIB=-latomic %endif -%make_build CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_ZLIB=1 USE_SYSTEMD=1 %{?_enable_lua:USE_LUA=1} \ - ${regparm_opts:-} ${addlib_opts:-} PREFIX="%_prefix" ADDINC="$(pcre2-config --cflags)" CFLAGS="%optflags" \ - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" +%make_build CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_ZLIB=1 USE_SYSTEMD=1 USE_PROMEX=1 %{?_enable_lua:USE_LUA=1} \ + ${regparm_opts:-} ${addlib_opts:-} PREFIX="%_prefix" ADDINC="$(pcre2-config --cflags)" CFLAGS="%optflags" -pushd contrib/halog -%make halog OPTIMIZE="%optflags" -popd +#pushd contrib/halog +#%make halog OPTIMIZE="%optflags" +#popd #pushd contrib/iprange #%make iprange OPTIMIZE="%optflags" @@ -107,6 +106,9 @@ cp -p examples/errorfiles/* %buildroot%haproxy_datadir/ %attr(-,%haproxy_user,%haproxy_group) %dir %haproxy_home %changelog +* Fri Sep 16 2022 Alexey Shabalin 2.6.5-alt1 +- 2.6.5 + * Tue Apr 20 2021 Alexey Shabalin 2.3.9-alt1 - 2.3.9