From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45F33158090 for ; Thu, 26 May 2022 13:38:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53651E077F; Thu, 26 May 2022 13:38:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35676E077F for ; Thu, 26 May 2022 13:38:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 071693418D5 for ; Thu, 26 May 2022 13:38:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 137083B8 for ; Thu, 26 May 2022 13:38:41 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1653572236.c368b3cbac7f7cd1ee7f72091bbda8f3ba480e16.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: gentoo/release-userspace.sh X-VCS-Directories: gentoo/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: c368b3cbac7f7cd1ee7f72091bbda8f3ba480e16 X-VCS-Branch: master Date: Thu, 26 May 2022 13:38:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b43cfdcc-a453-4d8c-a37c-62e3bc9e74ee X-Archives-Hash: 4268f0bcdc6641817962c676e3448337 commit: c368b3cbac7f7cd1ee7f72091bbda8f3ba480e16 Author: Jason Zaman gentoo org> AuthorDate: Thu May 26 13:37:16 2022 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu May 26 13:37:16 2022 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=c368b3cb Update release-userspace script release date is no longer used, also set PYTHON_COMPAT Signed-off-by: Jason Zaman gentoo.org> gentoo/release-userspace.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gentoo/release-userspace.sh b/gentoo/release-userspace.sh index f1db4d38..93565f23 100644 --- a/gentoo/release-userspace.sh +++ b/gentoo/release-userspace.sh @@ -4,18 +4,17 @@ # Copyright 2017-2021 Jason Zaman # Licensed under the GPL-3 license -RELEASEDATE="${1}" -NEWVERSION="${2}" +NEWVERSION="${1}" PACKAGES=" sys-libs/libsepol +sys-apps/secilc sys-libs/libselinux sys-libs/libsemanage sys-apps/checkpolicy sys-apps/policycoreutils sys-apps/selinux-python sys-apps/semodule-utils -sys-apps/secilc sys-apps/mcstrans sys-apps/restorecond " @@ -25,7 +24,7 @@ sys-apps/restorecond usage() { echo "Usage: $0 " echo "" - echo "Example: $0 20170101 2.7_rc1" + echo "Example: $0 3.4_rc1" echo "" echo "The script will update the live ebuilds then copy towards the" echo "." @@ -53,15 +52,15 @@ die() { } # set the release date in the live ebuilds so it will be correct when copying to the new version -setLiveReleaseDate() { +updateLiveEbuilds() { local PKG local PN - cd ${GENTOOX86} + cd ${GENTOOX86} || die echo "Setting release date var in live ebuilds... " for PKG in $PACKAGES do - cd "${GENTOOX86}/${PKG}" + cd "${GENTOOX86}/${PKG}" || die PN="${PKG#*/}" [[ -f "${PN}-9999.ebuild" ]] || continue @@ -71,8 +70,9 @@ setLiveReleaseDate() { # update header and release date sed -i "s@Copyright 1999-20.. Gentoo .*@Copyright 1999-$(date '+%Y') Gentoo Authors@" "${PN}-9999.ebuild" - sed -i "/^MY_RELEASEDATE=/s/.*/MY_RELEASEDATE=\"${RELEASEDATE}\"/" "${PN}-9999.ebuild" - sed -i "/SRC_URI/s@raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases@github.com/SELinuxProject/selinux/releases/download@" "${PN}-9999.ebuild" + + # Update PYTHON_COMPAT + sed -i '/^PYTHON_COMPAT/s/PYTHON_COMPAT=.*$/PYTHON_COMPAT=( python3_{8..10} )/' "${PN}-9999.ebuild" || die # no changes, skip [[ -z "$(git status --porcelain -- .)" ]] && continue @@ -127,7 +127,7 @@ createEbuilds() { echo -e "\ndone ${PN}\n" } -if [ $# -ne 2 ] +if [ $# -ne 1 ] then usage exit 3 @@ -136,7 +136,7 @@ fi # Assert that all needed information is available assertDirEnvVar GENTOOX86 -setLiveReleaseDate +updateLiveEbuilds # Create ebuilds createEbuilds