diff --git a/.gear/tags/39e3fd9735af72d41939c5926d33778f0f497e07 b/.gear/tags/39e3fd9735af72d41939c5926d33778f0f497e07 deleted file mode 100644 index 7bff45907..000000000 --- a/.gear/tags/39e3fd9735af72d41939c5926d33778f0f497e07 +++ /dev/null @@ -1,22 +0,0 @@ -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/bce6798ac5b0756a9d067eb2ab577c54382123df b/.gear/tags/bce6798ac5b0756a9d067eb2ab577c54382123df new file mode 100644 index 000000000..5b5c4a498 --- /dev/null +++ b/.gear/tags/bce6798ac5b0756a9d067eb2ab577c54382123df @@ -0,0 +1,12 @@ +object 274d1a4dffe332885bce12f04ac0e452c5f512b2 +type commit +tag v2.6.6 +tagger Christopher Faulet 1663849867 +0200 + +HAProxy 2.6.6 +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQQH1fGNIBmE19E/t6r1+TYmeqSygAUCYyxViwAKCRD1+TYmeqSy +gEGgAJ9UdKXPzgYBycUhToI8gcT6LFy1bACaAgBeAQASzG+KyHWl3zoaV47zRts= +=0Dhu +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list index abe81384b..0ccfa317d 100644 --- a/.gear/tags/list +++ b/.gear/tags/list @@ -1 +1 @@ -39e3fd9735af72d41939c5926d33778f0f497e07 v2.6.5 +bce6798ac5b0756a9d067eb2ab577c54382123df v2.6.6 diff --git a/haproxy.spec b/haproxy.spec index e0b62a17f..0410d5435 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -7,7 +7,7 @@ %def_enable lua Name: haproxy -Version: 2.6.5 +Version: 2.6.6 Release: alt1 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments @@ -56,9 +56,10 @@ addlib_opts=ADDLIB=-latomic %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 +#pushd admin/halog #%make halog OPTIMIZE="%optflags" #popd +%make admin/halog/halog OPTIMIZE="%optflags" #pushd contrib/iprange #%make iprange OPTIMIZE="%optflags" @@ -75,7 +76,7 @@ install -p -D -m 0644 %SOURCE3 %buildroot%_logrotatedir/%name install -d -m 0755 %buildroot%haproxy_home install -d -m 0755 %buildroot%haproxy_datadir install -d -m 0755 %buildroot%_bindir -install -p -m 0755 contrib/halog/halog %buildroot%_bindir/halog +install -p -m 0755 admin/halog/halog %buildroot%_bindir/halog #install -p -m 0755 contrib/iprange/iprange %buildroot%_bindir/iprange cp -p examples/errorfiles/* %buildroot%haproxy_datadir/ @@ -92,7 +93,7 @@ cp -p examples/errorfiles/* %buildroot%haproxy_datadir/ %preun_service haproxy %files -%doc CHANGELOG LICENSE README ROADMAP doc/architecture.txt doc/configuration.txt doc/intro.txt doc/management.txt doc/proxy-protocol.txt examples/*.cfg +%doc CHANGELOG LICENSE README doc/architecture.txt doc/configuration.txt doc/intro.txt doc/management.txt doc/proxy-protocol.txt examples/*.cfg %dir %haproxy_confdir %config(noreplace) %haproxy_confdir/%name.cfg %dir %haproxy_datadir @@ -106,6 +107,9 @@ cp -p examples/errorfiles/* %buildroot%haproxy_datadir/ %attr(-,%haproxy_user,%haproxy_group) %dir %haproxy_home %changelog +* Sat Nov 05 2022 Petr Usoltsev 2.6.6-alt1 +- 2.6.6 + * Fri Sep 16 2022 Alexey Shabalin 2.6.5-alt1 - 2.6.5