| 1 |
commit: 0da27079d45553ba19ea624f88b1541af52a07b4 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 3 21:44:23 2021 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 3 21:44:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da27079 |
| 7 |
|
| 8 |
www-servers/nginx: fix versionator usage on new EAPI=7 ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 12 |
|
| 13 |
www-servers/nginx/nginx-1.19.6-r100.ebuild | 12 ++++++------ |
| 14 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-servers/nginx/nginx-1.19.6-r100.ebuild b/www-servers/nginx/nginx-1.19.6-r100.ebuild |
| 17 |
index 0d7ed9f60c5..60f48de8f52 100644 |
| 18 |
--- a/www-servers/nginx/nginx-1.19.6-r100.ebuild |
| 19 |
+++ b/www-servers/nginx/nginx-1.19.6-r100.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2020 Gentoo Authors |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
@@ -900,7 +900,7 @@ pkg_postinst() { |
| 27 |
# do not need to distinguish between stable and mainline |
| 28 |
local _need_to_fix_CVE2013_0337=1 |
| 29 |
|
| 30 |
- if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then |
| 31 |
+ if ver_test ${_replacing_version} -ge 1.4.1-r2; then |
| 32 |
# We are updating an installation which should already be fixed |
| 33 |
_need_to_fix_CVE2013_0337=0 |
| 34 |
debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" |
| 35 |
@@ -911,7 +911,7 @@ pkg_postinst() { |
| 36 |
|
| 37 |
# Do we need to inform about HTTPoxy mitigation? |
| 38 |
# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f |
| 39 |
- if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then |
| 40 |
+ if ver_test ${_replacing_version_branch} -lt 1.10; then |
| 41 |
# Updating from <1.10 |
| 42 |
_has_to_show_httpoxy_mitigation_notice=1 |
| 43 |
debug-print "Need to inform about HTTPoxy mitigation!" |
| 44 |
@@ -934,7 +934,7 @@ pkg_postinst() { |
| 45 |
_fixed_in_pvr= |
| 46 |
esac |
| 47 |
|
| 48 |
- if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then |
| 49 |
+ if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then |
| 50 |
# We are updating an installation where we already informed |
| 51 |
# that we are mitigating HTTPoxy per default |
| 52 |
_has_to_show_httpoxy_mitigation_notice=0 |
| 53 |
@@ -949,7 +949,7 @@ pkg_postinst() { |
| 54 |
# All branches up to 1.11 are affected |
| 55 |
local _need_to_fix_CVE2016_1247=1 |
| 56 |
|
| 57 |
- if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then |
| 58 |
+ if ver_test ${_replacing_version_branch} -lt 1.10; then |
| 59 |
# Updating from <1.10 |
| 60 |
_has_to_adjust_permissions=1 |
| 61 |
debug-print "Need to adjust permissions to fix CVE-2016-1247!" |
| 62 |
@@ -972,7 +972,7 @@ pkg_postinst() { |
| 63 |
_fixed_in_pvr= |
| 64 |
esac |
| 65 |
|
| 66 |
- if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then |
| 67 |
+ if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then |
| 68 |
# We are updating an installation which should already be adjusted |
| 69 |
# or which was never affected |
| 70 |
_need_to_fix_CVE2016_1247=0 |
Archives