From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- www-servers/nginx/Manifest | 2 +- www-servers/nginx/nginx-1.19.6-r100.ebuild | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'www-servers/nginx') diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 5809102f62b8..dc1418f78ccd 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -48,6 +48,6 @@ EBUILD nginx-1.19.3.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc717 EBUILD nginx-1.19.4.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb EBUILD nginx-1.19.5-r1.ebuild 40431 BLAKE2B cf9bfea11e1845eb2c810c474dde72f275166bb55c48cb9658f71a512ede464b953dcc3f3fd9b0e0763190d856a4aa0585414f0bcf91cc5e29dde9e259dab9c7 SHA512 d92bacc4b3d5e97e7b85485507f8483f9f5166b43c4ed95c3e04a50b77aeaf10ce2a4609cf1d25357a88bb4516e5f05b020f37d666a81e1976a689e34ab8e794 EBUILD nginx-1.19.5.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb -EBUILD nginx-1.19.6-r100.ebuild 40495 BLAKE2B f4921f377f0fb38c03aacef796bed964f9c36df11acc3157e55ce28167ef5279230aa85166b6f785bc0ae89c890ca4032d1acfd50d468581055d5f89541ca8a0 SHA512 796b35525b178dc0a39bbe3d6a57a918d1f467969343de6d2cbd674c27cec37138cb4e0a2898c458cca78d398dc16caddf72be793b2ab6f4ce50f4b6f904d089 +EBUILD nginx-1.19.6-r100.ebuild 40436 BLAKE2B 643795722ca90b1d70f6a0a4917c9166f06802ae13a8a93b10e1a4e3b7eb4410091aba0980365b4d82a8117e625b5fe9c4468e7806769c7717284abaf67ea68c SHA512 9317b221e52c5097062f413c01be6dc3661a55215acba1933601cb0df002abf642413074752a052bf2740110bd754a8f62aae90468e4b7bc0e7ec4409026ffab EBUILD nginx-1.19.6.ebuild 40431 BLAKE2B cf9bfea11e1845eb2c810c474dde72f275166bb55c48cb9658f71a512ede464b953dcc3f3fd9b0e0763190d856a4aa0585414f0bcf91cc5e29dde9e259dab9c7 SHA512 d92bacc4b3d5e97e7b85485507f8483f9f5166b43c4ed95c3e04a50b77aeaf10ce2a4609cf1d25357a88bb4516e5f05b020f37d666a81e1976a689e34ab8e794 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903 diff --git a/www-servers/nginx/nginx-1.19.6-r100.ebuild b/www-servers/nginx/nginx-1.19.6-r100.ebuild index 0d7ed9f60c51..60f48de8f52d 100644 --- a/www-servers/nginx/nginx-1.19.6-r100.ebuild +++ b/www-servers/nginx/nginx-1.19.6-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -900,7 +900,7 @@ pkg_postinst() { # do not need to distinguish between stable and mainline local _need_to_fix_CVE2013_0337=1 - if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + if ver_test ${_replacing_version} -ge 1.4.1-r2; then # We are updating an installation which should already be fixed _need_to_fix_CVE2013_0337=0 debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" @@ -911,7 +911,7 @@ pkg_postinst() { # Do we need to inform about HTTPoxy mitigation? # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f - if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + if ver_test ${_replacing_version_branch} -lt 1.10; then # Updating from <1.10 _has_to_show_httpoxy_mitigation_notice=1 debug-print "Need to inform about HTTPoxy mitigation!" @@ -934,7 +934,7 @@ pkg_postinst() { _fixed_in_pvr= esac - if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then # We are updating an installation where we already informed # that we are mitigating HTTPoxy per default _has_to_show_httpoxy_mitigation_notice=0 @@ -949,7 +949,7 @@ pkg_postinst() { # All branches up to 1.11 are affected local _need_to_fix_CVE2016_1247=1 - if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + if ver_test ${_replacing_version_branch} -lt 1.10; then # Updating from <1.10 _has_to_adjust_permissions=1 debug-print "Need to adjust permissions to fix CVE-2016-1247!" @@ -972,7 +972,7 @@ pkg_postinst() { _fixed_in_pvr= esac - if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + if [[ -z "${_fixed_in_pvr}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; then # We are updating an installation which should already be adjusted # or which was never affected _need_to_fix_CVE2016_1247=0 -- cgit v1.2.3