From nobody Tue Aug 08 16:49:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKzfx6GlFz4pp1h; Tue, 8 Aug 2023 16:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKzfx5qWnz4H7B; Tue, 8 Aug 2023 16:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691513353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utrxf5d0PZRvvCAQ6dPTBXMorpUtcMo6wtzQZYzMMR4=; b=J/Jwi75mbvehU1Vh/yIrxZBY0jjiC6oI0B7zuth/RFunooXsZHKZ3qtPNdX3kd3eW5TB5C mMBEkQFAX3sXx7GKibDRQEQ6sGypWEpRH4V5yR8BQ74b1KKGPL7wpAHuFLPzydulVcnPmJ sS4gVh4NqbiFpFz0t2sg9R3LSGsG9Rnpl1cihqbWtxu73JwrMVb92qFfJnKmy3z2ugtnB9 famqDO+PPuspnyxfQYCbMzkreuykjefU9k4C8hTFK8gARlFGVGCXREUFIRCmrCeKedJwOE kvqMK+cCHQ3La6FRe8aZoJ5t4rmZ3n/mf+W70OFSRDYS7UNnxjvFtZwNWBMy2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691513353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utrxf5d0PZRvvCAQ6dPTBXMorpUtcMo6wtzQZYzMMR4=; b=JtFyvt7VeDdVkt3q5rE3tp7leDUxaevSHriZZt6QL9GPonZ+oAIjBTratT94QF92gXfWpT U4LAytOCu6AtICWePxjJeclFHFoafX3hY7VmjINrUz05ZLgDuXsy3EGdyUxV5j0wWOEnMw sfYivSMePDtqsnP9pSUqwfZTwuE4aREHP2OyWsQ+haVU6Cmhoc2Dv72HpNZD7sTJOWIHys NJE4HnEkvqIpyBrRdppCsZZfllZfjFohv0O+/3StqIJar2nOL+JpXDRkav/rRdaSnsnuQl S+v/uGq0s/E92jIp5YvmIWsvM0nAAKCDcinecYMmhwmGB0xk47tdQVE2Kn8KYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691513353; a=rsa-sha256; cv=none; b=XxvkAFblKDDFAOT5TkvK5+8xv6OJgQi8E9geAcdJ6hwl5lTiaa6GgqfZzMMb+etmctgcug H1oYFdKGDaaAPyu25bMp4FtHZgvYjiiLmLn8wp9+QB4AoYRy0i4MxY2azRn1HaRmJc9suQ 8f+W3HzjEw5rADKESJ9ubuq/xEvWLq3nVn8JWk8D1JfqJO9NAsEeCeBAnlFJyqPf9c73Et AcIxvgO8dzZ5dYstRbbjjjnmKiRD8lUjpH7C0/Wfc8M5xvScUJ4hjpIW8ayI9ijCUKGIZM AzCbkHNZ+5pjQZsqCPgoNrPGkiwEksqq/NgeR9nOSy0Y57Su0fCqueJ+U1Vnzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKzfx4vRpzhR0; Tue, 8 Aug 2023 16:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378GnD0V057638; Tue, 8 Aug 2023 16:49:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378GnDFm057637; Tue, 8 Aug 2023 16:49:13 GMT (envelope-from git) Date: Tue, 8 Aug 2023 16:49:13 GMT Message-Id: <202308081649.378GnDFm057637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 41b96792050e - stable/12 - ssh: remove pre- and post-merge update steps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 41b96792050ec9bf5069f451732c29d20275c461 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=41b96792050ec9bf5069f451732c29d20275c461 commit 41b96792050ec9bf5069f451732c29d20275c461 Author: Ed Maste AuthorDate: 2022-10-06 14:57:41 +0000 Commit: Ed Maste CommitDate: 2023-08-08 16:46:47 +0000 ssh: remove pre- and post-merge update steps We no longer use the pre- and post-merge scripts to strip/add RCS tags. The tags have been removed from main, but persist on older branches. While here renumber the steps in the update documentation using a more conventional scheme. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36904 (cherry picked from commit fca7ac55f8db80b5250bd80a83e1368fe0c39ae5) (cherry picked from commit b9622c483be52dd4cd7411da91b23d9f7e761130) --- crypto/openssh/FREEBSD-upgrade | 48 +++++++++++++----------------------- crypto/openssh/freebsd-post-merge.sh | 14 ----------- crypto/openssh/freebsd-pre-merge.sh | 16 ------------ 3 files changed, 17 insertions(+), 61 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 50ef62d3fec6..bf3cf44d1670 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -6,36 +6,36 @@ src/freebsd/vendor/. In addition, this assumes there is a "freebsd" origin pointing to git(repo).freebsd.org/src.git. -00) Make sure your mail spool has plenty of free space. It'll fill up +01) Make sure your mail spool has plenty of free space. It'll fill up pretty fast once you're done with this checklist. -01) Download the latest OpenSSH-portable tarball and signature from +02) Download the latest OpenSSH-portable tarball and signature from OpenBSD (https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/). -02) Verify the signature: +03) Verify the signature: $ gpg --verify openssh-X.YpZ.tar.gz.asc -03) Unpack the tarball in a suitable directory: +04) Unpack the tarball in a suitable directory: $ tar xf openssh-X.YpZ.tar.gz -04) Copy to a vendor branch: +05) Copy to a vendor branch: $ cd src/freebsd/main $ git worktree add ../vendor/openssh freebsd/vendor/openssh $ cd ../vendor/openssh $ rsync --archive --delete --exclude=.git /path/to/openssh-X.YpZ/ ./ -05) Take care of added / deleted files: +06) Take care of added / deleted files: $ git add -A -06) Commit: +07) Commit: $ git commit -m "Vendor import of OpenSSH X.YpZ" -07) Tag: +08) Tag: $ git tag -a -m "Tag OpenSSH X.YpZ" vendor/openssh/X.YpZ @@ -46,12 +46,6 @@ (It could also be pushed later on, along with the merge to main, but pushing now allows others to collaborate.) -08) Check out head and run the pre-merge script, which strips our RCS - tags from files that have them: - - $ cd src/freebsd/main/crypto/openssh - $ sh freebsd-pre-merge.sh - 09) Merge from the vendor branch: $ git subtree merge -P crypto/openssh vendor/openssh @@ -61,11 +55,11 @@ git prompts for these deleted files during the merge, choose 'd' (leaving them deleted). -0A) Resolve conflicts. Remember to bump the version addendum in +10) Resolve conflicts. Remember to bump the version addendum in version.h, and update the default value in ssh{,d}_config and ssh{,d}_config.5. -0B) Diff against the vendor branch: +11) Diff against the vendor branch: $ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh @@ -74,40 +68,32 @@ FreeBSD=%H and be listed in the 'keywords' file created by the pre-merge script. -0C) Run the post-merge script, which re-adds RCS tags to files that - need them: - - $ sh freebsd-post-merge.sh - - These tags are not used with git, but we will leave them in place as - long as svn-based FreeBSD 12.x is supported. - -0D) Run the configure script: +12) Run the configure script: $ sh freebsd-configure.sh -0E) Review changes to config.h very carefully. +13) Review changes to config.h very carefully. Note that libwrap should not be defined in config.h; as of r311585 (233932cc2a60) it is conditional on MK_TCP_WRAPPERS. -0F) If source files have been added or removed, update the appropriate +14) If source files have been added or removed, update the appropriate makefiles to reflect changes in the vendor's Makefile.in. -10) Update ssh_namespace.h: +15) Update ssh_namespace.h: $ sh freebsd-namespace.sh -11) Build and install world, reboot, test. Pay particular attention +16) Build and install world, reboot, test. Pay particular attention to pam_ssh(8), which gropes inside libssh and will break if something significant changes or if ssh_namespace.h is out of whack. -12) Check for references to obsolete configuration options +17) Check for references to obsolete configuration options (e.g., ChallengeResponseAuthentication in sshd_config) which may exist in release/ scripts. -13) Commit, and hunker down for the inevitable storm of complaints. +18) Commit, and hunker down for the inevitable storm of complaints. diff --git a/crypto/openssh/freebsd-post-merge.sh b/crypto/openssh/freebsd-post-merge.sh deleted file mode 100755 index b9e4cbddc7e8..000000000000 --- a/crypto/openssh/freebsd-post-merge.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -xargs perl -n -i -e ' - print; - s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print; -' keywords -:>rcsid -git ls-files | \ -while read f ; do - egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords - egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid -done -sort -u keywords rcsid | xargs perl -n -i -e ' - $strip = $ARGV if /\$(Id|OpenBSD):.*\$/; - print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/); -'