From owner-svn-src-stable@freebsd.org  Wed Sep 30 20:57:02 2020
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 373E4430B46;
 Wed, 30 Sep 2020 20:57:02 +0000 (UTC)
 (envelope-from emaste@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 "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C1pTp0j7Wz3XSh;
 Wed, 30 Sep 2020 20:57:02 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC95B259A3;
 Wed, 30 Sep 2020 20:57:01 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08UKv13r094687;
 Wed, 30 Sep 2020 20:57:01 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08UKv1UW094686;
 Wed, 30 Sep 2020 20:57:01 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <202009302057.08UKv1UW094686@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 30 Sep 2020 20:57:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r366299 - stable/12/share/examples/ipfw
X-SVN-Group: stable-12
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/12/share/examples/ipfw
X-SVN-Commit-Revision: 366299
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Sep 2020 20:57:02 -0000

Author: emaste
Date: Wed Sep 30 20:57:01 2020
New Revision: 366299
URL: https://svnweb.freebsd.org/changeset/base/366299

Log:
  MFC r359067: -F is GNU diff specific, not implemented in BSD diff.
  
  PR:		239519
  Reported by:	kouya@ryuhoku.jp [in -CURRENT]
  MFC after:	3 days

Modified:
  stable/12/share/examples/ipfw/change_rules.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/examples/ipfw/change_rules.sh
==============================================================================
--- stable/12/share/examples/ipfw/change_rules.sh	Wed Sep 30 19:23:25 2020	(r366298)
+++ stable/12/share/examples/ipfw/change_rules.sh	Wed Sep 30 20:57:01 2020	(r366299)
@@ -149,7 +149,7 @@ cat <<!
 The new rules are now installed. The previous rules have been preserved in
 the file ${edit_file}.$DATE
 !
-diff -F "^# .*[A-Za-z]" -u ${edit_file}.$DATE ${edit_file} \
+diff -u ${edit_file}.$DATE ${edit_file} \
     | mail -s "`hostname` Firewall rule change" root
 rm ${TMPFILE}
 exit 0