summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.hgtags11
-rw-r--r--docs/changes.xml21
-rw-r--r--pkg/rpm/unit.module.spec.in4
-rw-r--r--pkg/rpm/unit.spec.in5
4 files changed, 41 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 30977d4d..e8b6cc13 100644
--- a/.hgtags
+++ b/.hgtags
@@ -10,12 +10,23 @@ d2fcec5b0fa3b0e8da1945aa240d23be3bf94309 0.7
fbe7f5a3867e9559ef0884786fe5150aa60414e6 1.2
b3cf22b8a17e0e35ca80decb03ed2cceb662c3de 1.3
8f4524a9cf87fbddf626302da071f5055cf33f28 1.4
+99d69d59aa5edee3405d304886d9319291e392ba 1.4-2
b3dee0cc5a4edd046345511769b5cfec49044f1c 1.5
+e507438883ef0044c278f1accfc7bc7f90c0ffb6 1.5-1
d411e7fdee9e03036adb652f8d9f4c45a420bdd5 1.6
+01160bbced577121cb14d0b86ec1f8bb764cfab2 1.6-1
784b45adb0fe8bdd707510f59ed18309087e5c21 1.7
+abb8cfb421f608df1c23f5c333c5f049a79a681a 1.7-1
0f04ef991fbc1dadbc590ab7fb229d4f3d6357bc 1.7.1
+fe0d5eb09b66e77a2b66455faa51d3fa04146d3d 1.7.1-1
0a18a14d169f156f8e2daca35aa86d5a6dd9b1ae 1.8.0
+f47fc64d3d9e3dedb95042e93c7f73b31f458338 1.8.0-1
dda6319de785dc2d225d818349aba56fc48d47f6 1.9.0
+c927a739754ade5ecf7be8da30f6c42446e72d8c 1.9.0-1
cdbba3c3e3762eacc308a5407877c3665a05058d 1.10.0
+01322f5ec4e37fd0fd8d9d3e491e8539341160f3 1.10.0-1
+b651ff72ffe080835f884a1ace8fa24eb33e3569 1.10.0-2
3b1601ac0f2f53fed4cae01b9db0e4e070665cae 1.11.0
+7d54dfd170985c2ae8281219cfe7aa19de6d0de0 1.11.0-1
+c27c08b0deeee58676f3880f0f315388ce5d9322 1.11.0-2
b391df5f0102aa6afe660cfc863729c1b1111c9e 1.12.0
diff --git a/docs/changes.xml b/docs/changes.xml
index 3ae75b5c..e0dc0b3f 100644
--- a/docs/changes.xml
+++ b/docs/changes.xml
@@ -5,6 +5,27 @@
<change_log title="unit">
+<changes apply="unit
+ unit-php
+ unit-python unit-python2.7
+ unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7
+ unit-go unit-go1.7 unit-go1.8 unit-go1.9 unit-go1.10 unit-go1.11
+ unit-perl
+ unit-ruby
+ unit-jsc-common unit-jsc8 unit-jsc10 unit-jsc11"
+ ver="1.11.0" rev="2"
+ date="2019-09-29" time="13:30:00 +0300"
+ packager="Konstantin Pavlov &lt;thresh@nginx.com&gt;">
+
+<change>
+<para>
+Bump packaging version to fix repositories inconsistencies.
+</para>
+</change>
+
+</changes>
+
+
<changes apply="unit-php
unit-python unit-python2.7
unit-python3.4 unit-python3.5 unit-python3.6 unit-python3.7
diff --git a/pkg/rpm/unit.module.spec.in b/pkg/rpm/unit.module.spec.in
index 2ef4ff1b..023ebfab 100644
--- a/pkg/rpm/unit.module.spec.in
+++ b/pkg/rpm/unit.module.spec.in
@@ -10,7 +10,11 @@
%define unit_version %%UNIT_VERSION%%
%define unit_release %%UNIT_RELEASE%%%{?dist}.ngx
+%if (0%{?rhel} == 6) && (%{_arch} == x86_64)
+%define CC_OPT %{optflags} -fno-strict-aliasing
+%else
%define CC_OPT %{optflags}
+%endif
%define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%")
diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in
index 7fc950ec..afd2f1ff 100644
--- a/pkg/rpm/unit.spec.in
+++ b/pkg/rpm/unit.spec.in
@@ -29,7 +29,12 @@ BuildRequires: openssl-devel
BuildRequires: libopenssl-devel
%endif
+%if (0%{?rhel} == 6) && (%{_arch} == x86_64)
+%define CC_OPT %{optflags} -fno-strict-aliasing -fPIC
+%else
%define CC_OPT %{optflags} -fPIC
+%endif
+
%define LD_OPT -Wl,-z,relro -Wl,-z,now -pie
%define CONFIGURE_ARGS $(echo "%%CONFIGURE_ARGS%%")