From d34ed8d1c2e126bfd42a45f8a9bcd1e69c9b2830 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 11 Jul 2024 19:23:10 -0400 Subject: [PATCH] openssl-bad: minor qa, fix UnquotedVariable --- .github/workflows/pkgcheck.yaml | 2 +- .github/workflows/pkgcheck_merge.yaml | 2 +- dev-libs/openssl-bad/openssl-bad-1.0.2_p20220901-r1.ebuild | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pkgcheck.yaml b/.github/workflows/pkgcheck.yaml index 7d306f75c..2c5f6f46c 100644 --- a/.github/workflows/pkgcheck.yaml +++ b/.github/workflows/pkgcheck.yaml @@ -15,7 +15,7 @@ jobs: - name: Tree-wide pkgcheck error check uses: pkgcore/pkgcheck-action@v1 with: - args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs + args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable - name: Commit pkgcheck warnings uses: pkgcore/pkgcheck-action@v1 diff --git a/.github/workflows/pkgcheck_merge.yaml b/.github/workflows/pkgcheck_merge.yaml index 7938c5897..5670b6847 100644 --- a/.github/workflows/pkgcheck_merge.yaml +++ b/.github/workflows/pkgcheck_merge.yaml @@ -16,7 +16,7 @@ jobs: - name: Tree-wide pkgcheck error check uses: pkgcore/pkgcheck-action@v1 with: - args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs + args: --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable - name: Commit pkgcheck warnings uses: pkgcore/pkgcheck-action@v1 diff --git a/dev-libs/openssl-bad/openssl-bad-1.0.2_p20220901-r1.ebuild b/dev-libs/openssl-bad/openssl-bad-1.0.2_p20220901-r1.ebuild index 8b47fdde4..04636663d 100644 --- a/dev-libs/openssl-bad/openssl-bad-1.0.2_p20220901-r1.ebuild +++ b/dev-libs/openssl-bad/openssl-bad-1.0.2_p20220901-r1.ebuild @@ -12,6 +12,7 @@ HOMEPAGE="https://github.com/drwetter/openssl-1.0.2.bad" MY_COMMIT="698be5f5b6d0d150fb45182824864016389f1868" SRC_URI="https://github.com/drwetter/openssl-1.0.2.bad/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/openssl-1.0.2.bad-${MY_COMMIT}" LICENSE="openssl" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa m68k ~mips ppc ppc64 sparc x86 ~arm-linux ~x86-linux" @@ -32,8 +33,6 @@ DEPEND="${RDEPEND} )" PDEPEND="app-misc/ca-certificates" -S="${WORKDIR}/openssl-1.0.2.bad-${MY_COMMIT}" - MULTILIB_WRAPPED_HEADERS=( usr/include/openssl/opensslconf.h ) @@ -63,7 +62,6 @@ src_prepare() { # make sure the man pages are suffixed #302165 # don't bother building man pages if they're disabled sed -i \ - -e '/DIRS/s: fips : :g' \ -e '/^MANSUFFIX/s:=.*:=ssl:' \ -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ -e $(has noman FEATURES \ @@ -93,7 +91,7 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) append-cppflags -DOPENSSL_NO_BUF_FREELISTS - sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 + sed -i '1s,^:$,#!'"${EPREFIX}"'/usr/bin/perl,' Configure #141906 # The config script does stupid stuff to prompt the user. Kill it. sed -i '/stty -icanon min 0 time 50; read waste/d' config || die ./config --test-sanity || die "I AM NOT SANE"