diff --git a/.github/workflows/pentoo-visibility.yaml b/.github/workflows/pentoo-visibility.yaml new file mode 100644 index 000000000..ba7aeeec5 --- /dev/null +++ b/.github/workflows/pentoo-visibility.yaml @@ -0,0 +1,28 @@ +name: Pentoo Visibility Check + +on: + schedule: + - cron: "3 * * * *" + pull_request: + branches: + - master + +jobs: + pentoo-visibility-check: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v5 + with: + fetch-depth: 0 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: List added files + run: git diff-tree --no-commit-id --name-only -r ${{ github.sha }} + - + name: Visibility Check + run: | + sudo docker build --progress=plain . -f scripts/qa/Dockerfile diff --git a/.github/workflows/pkgcheck.yaml b/.github/workflows/pkgcheck.yaml index 516a50249..a984c72de 100644 --- a/.github/workflows/pkgcheck.yaml +++ b/.github/workflows/pkgcheck.yaml @@ -2,13 +2,16 @@ name: pkgcheck on: push: branches: [master] + pull_request: + branches: + - master jobs: - build: + pkgcheck: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 @@ -20,9 +23,9 @@ 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,UnquotedVariable,VisibleVcsPkg,NonexistentDeps,-MasterPackageClobbered + args: --net --exit error -k error,PkgMetadataXmlIndentation,DeprecatedManifestHash,UnusedInherits,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-NonsolvableDepsInExp,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,UnquotedVariable,VisibleVcsPkg,NonexistentDeps,-MasterPackageClobbered - name: Commit pkgcheck warnings uses: pkgcore/pkgcheck-action@v1 with: - args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} + args: --net --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} diff --git a/.github/workflows/pkgcheck_merge.yaml b/.github/workflows/pkgcheck_merge.yaml deleted file mode 100644 index 290924ca1..000000000 --- a/.github/workflows/pkgcheck_merge.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: pkgcheck_merge -on: - pull_request: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Tree-wide pkgcheck pentoo-ci - uses: pkgcore/pkgcheck-action@v1 - with: - args: -C PentooCI --exit PentooCI --net - - - 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,UnquotedVariable,VisibleVcsPkg,-MasterPackageClobbered - - - name: Commit pkgcheck warnings - uses: pkgcore/pkgcheck-action@v1 - with: - args: --exit warning -k ,PkgMetadataXmlIndentation,-NonsolvableDepsInStable,-NonsolvableDepsInDev,-PotentialStable,-UnknownProfilePackage,-DeprecatedDep,-MissingUseDepDefault,ProfileError,ProfileWarning,UnknownProfilePackageUse,OldPackageUpdate,OldMultiMovePackageUpdate,LaggingProfileEapi,UnknownProfilePackageKeywords,-UnusedProfileDirs,EclassReservedName,VisibleVcsPkg,DeprecatedEapi,MissingRemoteId,DistutilsNonPEP517Build,OldPackageNameDep,NonexistentDeps,-MasterPackageClobbered --commits HEAD^..${{ github.sha }} diff --git a/README.md b/README.md index 1e4227c6f..e3ccb707d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +[![pkgcheck](https://github.com/pentoo/pentoo-overlay/actions/workflows/pkgcheck.yaml/badge.svg?event=push)](https://github.com/pentoo/pentoo-overlay/actions/workflows/pkgcheck.yaml) +[![Pentoo Metapackage Installable](https://github.com/pentoo/pentoo-overlay/actions/workflows/pentoo-visibility.yaml/badge.svg?event=schedule)](https://github.com/pentoo/pentoo-overlay/actions/workflows/pentoo-visibility.yaml) + # Pentoo Penetration Testing Overlay Gentoo overlay for security tools as well as the heart of the Pentoo Livecd @@ -34,17 +37,9 @@ Add Pentoo overlay eselect repository enable pentoo ``` -In case you have been already using layman as a repository manager, make sure to disable it since it has been deprecated by Gentoo: - -``` -layman -d pentoo -``` -and then make sure to inspect and remove /etc/portage/repos.conf/layman.conf and /var/lib/layman. - Want to learn more? [See the wiki.](https://github.com/pentoo/pentoo-overlay/wiki) -Discussion and support available on irc.freenode.net **#pentoo** - +Discussion and support information available on https://pentoo.org/ diff --git a/pentoo/pentoo-system/pentoo-system-2025.1.ebuild b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild similarity index 90% rename from pentoo/pentoo-system/pentoo-system-2025.1.ebuild rename to pentoo/pentoo-system/pentoo-system-2025.2.ebuild index 2a577df64..53bc0d052 100644 --- a/pentoo/pentoo-system/pentoo-system-2025.1.ebuild +++ b/pentoo/pentoo-system/pentoo-system-2025.2.ebuild @@ -10,7 +10,7 @@ SLOT="0" LICENSE="GPL-3" IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_virtualbox video_cards_vmware" -IUSE="+2fa livecd-stage1 pentoo-in-a-container pentoo-minimal pentoo pentoo-extra pentoo-full qemu windows-compat +X pcmcia +subversion ${IUSE_VIDEO_CARDS}" +IUSE="+2fa livecd-stage1 pentoo-in-a-container pentoo-minimal pentoo pentoo-extra pentoo-full qemu windows-compat pcmcia +subversion ${IUSE_VIDEO_CARDS}" S="${WORKDIR}" @@ -26,14 +26,13 @@ PDEPEND="${PDEPEND} !pentoo-minimal? ( !pentoo-in-a-container? ( sys-apps/fwupd ) ) video_cards_virtualbox? ( app-emulation/virtualbox-guest-additions ) ) - 2fa? ( X? ( app-crypt/yubikey-manager-qt - sys-auth/yubikey-personalization-gui - ) + 2fa? ( app-crypt/yubikey-manager app-crypt/ccid app-crypt/libu2f-host app-crypt/libu2f-server - sys-auth/pam_yubico ) + sys-auth/pam_yubico + ) !arm? ( app-portage/cpuid2cpuflags ) windows-compat? ( app-emulation/wine-vanilla )" diff --git a/scripts/qa/Dockerfile b/scripts/qa/Dockerfile new file mode 100644 index 000000000..03b069093 --- /dev/null +++ b/scripts/qa/Dockerfile @@ -0,0 +1,22 @@ +FROM pentoolinux/pentoo-core + +# Setup repos +WORKDIR /var/db/repos/ +# setup gentoo repo +RUN git clone https://github.com/gentoo/gentoo.git --depth 1 +# setup pentoo repo +#RUN git clone https://github.com/pentoo/pentoo-overlay.git pentoo --depth 1 +# Use the github checkout for pentoo, that's what we are testing +COPY . pentoo + +#Regen doubles the time it takes for the action to run +#Revisit if this is worth running when we have >2 emerge calls +#RUN time FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs=$(nproc) --quiet + +WORKDIR /home + +# disable minimal (pentoo-core is default minimal) +RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf + +#test install pentoo/pentoo +RUN time FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox" emerge --getbinpkg=y --buildpkg=n --jobs=$(nproc) --load-average=$(nproc) --deep --update --newuse pentoo/pentoo --verbose --pretend