From 75d329596181cfc2b4edff9e8979d0f7cf8bd957 Mon Sep 17 00:00:00 2001 From: serg-sg Date: Sun, 4 Dec 2022 00:42:32 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20app-misc/ca-ru-certificates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-misc/ca-ru-certificates/Manifest | 4 ++-- ... => ca-ru-certificates-2022.09.25-r11.ebuild} | 16 +++++----------- 2 files changed, 7 insertions(+), 13 deletions(-) rename app-misc/ca-ru-certificates/{ca-ru-certificates-2022.09.25-r10.ebuild => ca-ru-certificates-2022.09.25-r11.ebuild} (88%) diff --git a/app-misc/ca-ru-certificates/Manifest b/app-misc/ca-ru-certificates/Manifest index abd26fc..04826ed 100644 --- a/app-misc/ca-ru-certificates/Manifest +++ b/app-misc/ca-ru-certificates/Manifest @@ -1,2 +1,2 @@ -DIST ca-ru-certificates-2022.09.25_root.cer 1478 BLAKE2B 93dab17477cc5106088d526af07af43c6c0090d14ed747e876ffe931e18eef1c3f619645cc17f94c430a5aa607ad587027871de01e6c7b3026accf9e40a0e3bb SHA512 516f3375c890a5eb05c86703aaeb3854c94263982063d9248650d777c26958383751125be5b024eb861aad891352b7e6869b73a8aad75f1a8388f57dd6b4233e -DIST ca-ru-certificates-2022.09.25_sub.cer 1862 BLAKE2B 69a25dbb876c1caabd77357e5157aca5850523124ae5994ffebad3744553f49dad5c02142f4a0034fc3cca2949045615f2ada26259bd5ab70f1437a8a4e3e0e8 SHA512 f43105da3a0643cb887af52ade7a712d956c72ab7eb066ef6915f4eeafd5531119f1e4e555dae875f51732ce51e3ff7d79532297e8e0dd1816e93b4d87b235ae +DIST ca-ru-certificates-2022.09.25-r11_root.crt 2088 BLAKE2B cbe5482be781ab568bfdce2e6776ede74f1f39d4c934d2af3aea3dd47586952e8faf8a8fe8684d2fd5d6b6ca0615bb3c8da8d3cd0f223300f2cd99a6136bda90 SHA512 6b8b43fa77385175e7b15cffc955ad82b17ab7f9a7e40de97b1a194e8199ac851ee21b2a7fdc275599836ccef31203683b303e2bb00e44d3d95ca5f84e231fe7 +DIST ca-ru-certificates-2022.09.25-r11_sub.crt 2616 BLAKE2B 7c39b67af800789ea8a9ced2ce5aa4f5eea38fb87d6359e08831540b58930376297e0ab9c3ef131bf5e984f71432b2cd9e04816efe6626e377398bae1ca8a19d SHA512 321ef698460033d89bd7d7d8814bcb22e7aa077bbf34be329a7c88ec7d82361f7c32a6cb400159236443d64a48b6c5f825d87ba3b49b0f495575393ad08187fb diff --git a/app-misc/ca-ru-certificates/ca-ru-certificates-2022.09.25-r10.ebuild b/app-misc/ca-ru-certificates/ca-ru-certificates-2022.09.25-r11.ebuild similarity index 88% rename from app-misc/ca-ru-certificates/ca-ru-certificates-2022.09.25-r10.ebuild rename to app-misc/ca-ru-certificates/ca-ru-certificates-2022.09.25-r11.ebuild index 6a24cf8..4f3e8b7 100644 --- a/app-misc/ca-ru-certificates/ca-ru-certificates-2022.09.25-r10.ebuild +++ b/app-misc/ca-ru-certificates/ca-ru-certificates-2022.09.25-r11.ebuild @@ -7,8 +7,8 @@ DESCRIPTION="Установка корневого сертификата для HOMEPAGE="https://www.gosuslugi.ru/crt" SRC_URI=" -https://gu-st.ru/content/Other/doc/russian_trusted_root_ca.cer -> ${P}_root.cer -https://gu-st.ru/content/Other/doc/russian_trusted_sub_ca.cer -> ${P}_sub.cer +https://gu-st.ru/content/lending/russian_trusted_root_ca_pem.crt -> ${PF}_root.crt +https://gu-st.ru/content/lending/russian_trusted_sub_ca_pem.crt -> ${PF}_sub.crt " LICENSE="" @@ -25,8 +25,8 @@ RESTRICT="bindist mirror strip" S="${WORKDIR}" CA=usr/local/share/ca-certificates -RU_TR_R=${P}_root.crt -RU_TR_S=${P}_sub.crt +RU_TR_R=${PF}_root.crt +RU_TR_S=${PF}_sub.crt RU_TR_R_NAME="Russian Trusted Root CA - The Ministry of Digital Development and Communications" RU_TR_S_NAME="Russian Trusted Sub CA - The Ministry of Digital Development and Communications" @@ -38,17 +38,11 @@ massiv[${RU_TR_S_NAME}]=${RU_TR_S} src_prepare() { mkdir -p ${CA} || die + cp ${DISTDIR}/* ${CA} || die default } src_install() { - # Конвертируем DER в PEM - for k in ${A}; - do - kk=$(basename ${k} .cer); - /usr/bin/openssl x509 -in ${DISTDIR}/${k} -inform DER > ${CA}/${kk}.crt - done - mv * "${D}" || die }