From nobody Wed Oct 12 17:54:23 2022 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 4MngJc2XXWz4ZQBk; Wed, 12 Oct 2022 17:54:24 +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 4MngJc1xW8z3dSj; Wed, 12 Oct 2022 17:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665597264; 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=PuJDVQOVUnhKkePXZGXIwVutT3H2cqFklCZ8KnOsCME=; b=SAdsfDbjwVi/BcbPoGCy5QTxf6EU7MtBprmPejrf9FlS5Bok0agiLKSaaG7eJeTSlnOKtH ncGpR5OAs0mIUVFvL90GypZ/s/U5sXolvuqQZIuL8SyW2+g2jjMcESta45Z5QKBUR5h0Np Y9wkDV+3fv6OdoTJbh6gk+Z2W9+3kWI2tYYGwA4GymwgI9fWd3Bd5b8bST+TxADs2Wev09 jbtCpupOxHLdyV51eCfwo58Kl4CdMukFnK9C9ZV8OoXUgUjnHxNbRpceIJwjKGYU/JBamF t5TjGdeyBsfUIAbZ3SzLmX2Iwf39BD9Swo1glv3o6k19tv3lbRqEubs1627BWg== 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 4MngJc0BDLz1Nhg; Wed, 12 Oct 2022 17:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29CHsNUK094751; Wed, 12 Oct 2022 17:54:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CHsNXL094750; Wed, 12 Oct 2022 17:54:23 GMT (envelope-from git) Date: Wed, 12 Oct 2022 17:54:23 GMT Message-Id: <202210121754.29CHsNXL094750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fca7ac55f8db - main - 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/main X-Git-Reftype: branch X-Git-Commit: fca7ac55f8db80b5250bd80a83e1368fe0c39ae5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665597264; 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=PuJDVQOVUnhKkePXZGXIwVutT3H2cqFklCZ8KnOsCME=; b=u/6qftGeMHcvM61fLGDRgVHZd1xnxc8DzOU/f3un4Y8roLkcmfCjXd0o8E3NQ88pHie0pZ Q70Io1ipwpJ6yBaEfRmflJFFfQErXHWSukZl4oBw2wIPD9IKsfgLGwfGMOf2C7QlDm8p3Z 369pD8A0N8u/xVQx/qKntd94rAuXzT4VUU4JU6ERVKl5DAe7A4GZFdaFV1KomnfZW+uh74 lq9yKpM5wh2TQl84bvzAsxWAtNiyCh8rOMWnPjdZi8e/N0Nlocf45qAW8mQj27ArJ2y710 PhUVX8rdQR71/URE5AkNe5WP8NCqSuC1++ZyFeMOUljT6qdk1IUhcCEp6S6gZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665597264; a=rsa-sha256; cv=none; b=jldrNcMjvCCrYHWVinXiLE++05eE5kjxMYbnVjEBmJMhZl5lNLK2WbKdqNVlncg4jvbFdH yu3VGuw5Vw+g2pS9Ol3Lkok4qD85ZyGYk9xezF67ZNo2x3rHl7JyKBBdHPgsmbVKetpOhI h752e6J401HN97j9mbkgBY9Vcpn9rRXa/gTk6ppYdX6tTw7ZOx5tE0F0A5/2TZWeUTzjqu /X0H6K5VprQ73c1syX2BR5DDtgFW2zFefDexwQVQ1HOLu5y6Bu7OB6TVmhSlpWBpHw0q4D 9jMPstafiK0tvOn+JExmcHPAAwpY4Lad3AB1Mr0v9u1qpoEPPPUeIglsRUbJXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fca7ac55f8db80b5250bd80a83e1368fe0c39ae5 commit fca7ac55f8db80b5250bd80a83e1368fe0c39ae5 Author: Ed Maste AuthorDate: 2022-10-06 14:57:41 +0000 Commit: Ed Maste CommitDate: 2022-10-12 17:54:08 +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 --- crypto/openssh/FREEBSD-upgrade | 48 +++++++++++++----------------------- crypto/openssh/freebsd-post-merge.sh | 12 --------- crypto/openssh/freebsd-pre-merge.sh | 14 ----------- 3 files changed, 17 insertions(+), 57 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 54e1699e96c2..4384fc8bac6f 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 @@ -56,12 +56,6 @@ The update and tag could instead be pushed later, 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 @@ -71,11 +65,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 @@ -84,40 +78,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 ede469cf8283..000000000000 --- a/crypto/openssh/freebsd-post-merge.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# - -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[:\$]/); -'