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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC1A91382C5 for ; Mon, 30 Nov 2020 04:10:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8D98E0839; Mon, 30 Nov 2020 04:10:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43AECE0839 for ; Mon, 30 Nov 2020 04:10:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 135C8340E71 for ; Mon, 30 Nov 2020 04:10:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87DA846F for ; Mon, 30 Nov 2020 04:10:17 +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: <1606704841.51aae0778cb7c0a812c64654fe8f517a8a3450eb.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: gentoo/release-prepare.sh X-VCS-Directories: gentoo/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 51aae0778cb7c0a812c64654fe8f517a8a3450eb X-VCS-Branch: master Date: Mon, 30 Nov 2020 04:10:17 +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: cbcd51cf-4484-4c63-a3d4-fe9fb98f9ead X-Archives-Hash: 867614c351b76e51ccc9bd18700aba1c commit: 51aae0778cb7c0a812c64654fe8f517a8a3450eb Author: Jason Zaman gentoo org> AuthorDate: Mon Nov 30 02:47:19 2020 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Nov 30 02:54:01 2020 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=51aae077 Update gentoo release-prepare script - Make the glob more specific on selinux-* so it does not match sec-policy/apparmor-profiles - Also update the test instructions - Update copyright year automatically Signed-off-by: Jason Zaman gentoo.org> gentoo/release-prepare.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh index 243927b2..d8b69bbe 100644 --- a/gentoo/release-prepare.sh +++ b/gentoo/release-prepare.sh @@ -78,7 +78,7 @@ buildpatch() { createEbuilds() { cd ${GENTOOX86}/sec-policy; printf "Removing old patchbundle references in Manifest (in case of rebuild)... "; - for PKG in *; + for PKG in selinux-*; do [[ -f "${PKG}/Manifest}" ]] || continue; sed -i -e "/patchbundle-selinux-base-policy-${NEWVERSION}/d" ${PKG}/Manifest; @@ -86,10 +86,11 @@ createEbuilds() { printf "done\n"; printf "Creating new ebuilds based on 9999 version... "; - for PKG in *; + for PKG in selinux-*; do [[ -f "${PKG}/${PKG}-9999.ebuild" ]] || continue; cp ${PKG}/${PKG}-9999.ebuild ${PKG}/${PKG}-${NEWVERSION}.ebuild; + sed -i "s/Copyright 1999-201. Gentoo .*/Copyright 1999-$(date '+%Y') Gentoo Authors/" ${PKG}/${PKG}-${NEWVERSION}.ebuild; done printf "done\n"; } @@ -129,19 +130,19 @@ The release has now been prepared. Please go do the following to finish up: In ${GENTOOX86}/sec-policy: -git add . -repoman --digest=y full +$ git add . +$ repoman --digest=y full Then, before finally committing - do a run yourself, ensuring that the right version is deployed of course: -- "emerge -1 \$(qlist -IC sec-policy)" +# emerge -v1 @selinux-rebuild Only then do: -repoman commit -m 'sec-policy: Release of SELinux policies ${NEWVERSION}' -git push --sign +$ repoman commit -m 'sec-policy: Release of SELinux policies ${NEWVERSION}' +$ git push --sign In ${HARDENEDREFPOL} do: -git push origin --tags +$ git push origin --tags EOF cleanTmp;