[From nobody Thu Jun 25 05:54:49 2020 Received: from morpheus.net ([198.74.57.187]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fP89Z-0000rN-08 for openwrt-devel@lists.openwrt.org; Sat, 02 Jun 2018 15:09:14 +0000 Received: from [192.168.10.128] (ip70-185-225-250.ok.ok.cox.net [70.185.225.250]) by morpheus.net (Postfix) with ESMTPSA id 33EE6A19D7; Sat, 2 Jun 2018 11:01:14 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=morpheus.net; s=mail; t=1527951676; bh=2c07R5tpbkB4oTxJIgjC060ZT0lk5cB7X9QFd3uqms8=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=vQoOUUp5YwzPc3I/Gul42SvTXE8Ohwbio0CpIvBbsdOURzfVme4EJ47QdZe5KIqp+ AS99/dad4yh0iLi4sCDAsvJkwAvmda+AMX+MO6HIFGj+TDn7Ah/GUqEHd7k57oLbkJ 3oylKobVbAJta2Yasah1pkkvns30uPJG4UQWS5oA= Subject: Re: Bash patches format To: "Marty E. Plummer" <hanetzer@startmail.com>, Clark Wang <dearvoid@gmail.com> Cc: Chet Ramey <chet.ramey@case.edu>, bug-bash@gnu.org, ncopa@alpinelinux.org, ldv@altlinux.org, glebfm@altlinux.org, jeffbai@aosc.xyz, bpiotrowski@archlinux.org, doko@debian.org, core-ports@crux.nu, ehaupt@freebsd.org, base-system@gentoo.org, jan.steffens@gmail.com, demm@kaosx.us, ubuntu-devel-discuss@lists.ubuntu.com, raimue@macports.org, zap@homelink.ru, milang@tal.org, oberon@manjaro.org, simons@cryp.to, naddy@openbsd.org, nobodydead@gmail.com, tpgxyz@gmail.com, naoir@gmx.net, pkgsrc-users@netbsd.org, andrew.lukoshko@rosalab.ru, alex2048@mail.ru, trisquel-devel@listas.trisquel.info, openwrt-devel@lists.openwrt.org References: <20180530070456.p36falhq66wfgxqk@proprietary-killer> From: Matt Housh <jaeger@morpheus.net> Message-ID: <c7768d15-a87a-745b-4dbd-9fa17d4af69b@morpheus.net> Date: Sat, 2 Jun 2018 10:00:53 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180530070456.p36falhq66wfgxqk@proprietary-killer> Content-Type: multipart/mixed; boundary="------------594DC1D2DB210F901C08E6E8" Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180602_080913_183420_AAA1B18F X-CRM114-Status: GOOD ( 18.49 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Mailman-Approved-At: Mon, 20 Aug 2018 03:47:30 -0700 This is a multi-part message in MIME format. --------------594DC1D2DB210F901C08E6E8 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 5/30/2018 02:04, Marty E. Plummer wrote: > On Wed, May 30, 2018 at 10:42:27AM +0800, Clark Wang wrote: >> On Wed, May 30, 2018 at 8:25 AM, Marty E. Plummer <hanetzer@startmail.= com> >> wrote: >> >>>> If people are willing to do the conversion between patch formats for= >>> their >>>> own purposes, more power to them. I don't see any compelling reason = to >>>> change the format I use. >>>> >>> Could I at least convince you to start doing -p1, if not unified? >>> >> >> I think the cost is too high. All bash package maintainers on differen= t >> *nix systems will have to change accordingly. >> >> -clark > Well how about this; we ask the downstreams. List taken from repology, > hopefully these are still all active and accurate. So, to reiterate the= > original premise of this thread for the newly added, I suggest the > following: >=20 > 1. Change the official upstream bash patch format to be -p1 applicable,= > as a number of major linux distros either convert the patches in their > own source repo to -p1 (debian and its children, fedora and its childre= n), > or have to take an explicit deviation from their default patch > application method (gentoo) in order to apply -p0 patches. >=20 > Optional: > 2. Change the format of the patch from a context diff to a unified diff= , > for the following reasons: > a. unified diffs are generally smaller than an equivalent context > diff, while encoding the same information. > *** a/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500= > --- b/lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400= > *************** > *** 308,312 **** > { > if (history_stifled && history_max_entries > 0) > ! history_size =3D history_max_entries + 2; > else > history_size =3D DEFAULT_HISTORY_INITIAL_SIZE; > --- 310,316 ---- > { > if (history_stifled && history_max_entries > 0) > ! history_size =3D (history_max_entries > MAX_HISTORY_INI= TIAL_SIZE) > ! ? MAX_HISTORY_INITIAL_SIZE > ! : history_max_entries + 2; > else > history_size =3D DEFAULT_HISTORY_INITIAL_SIZE; >=20 > --- a/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500= > +++ b/lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400= > @@ -308,5 +310,7 @@ > { > if (history_stifled && history_max_entries > 0) > - history_size =3D history_max_entries + 2; > + history_size =3D (history_max_entries > MAX_HISTORY_INI= TIAL_SIZE) > + ? MAX_HISTORY_INITIAL_SIZE > + : history_max_entries + 2; > else > history_size =3D DEFAULT_HISTORY_INITIAL_SIZE; >=20 > b. <opinion> unified diffs are easier to size up at a glance than > context diffs. >=20 > c. <conjecture based on personal observation> unified diffs are the= > standard for a host of foss projects, especially those using git as= a > vcs solution as it produces context diffs by default and you have t= o > purposely change it to do otherwise. >=20 > Maintainers, I'd really like to hear your thoughts on this matter. If > the diffs are produced as -p1 unified diffs, then downstreams who do > convert from -p0 context won't have to, and distros who work around it > won't either. >=20 > Regards, >=20 > Marty >=20 Greetings, Speaking for the CRUX maintainers, we don't have a preference. Whatever works best for upstream. Regards, Matt --------------594DC1D2DB210F901C08E6E8 Content-Type: application/pgp-keys; name="pEpkey.asc" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="pEpkey.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- mQENBFsHSwMBCADLF7hRz48jhmTDplQXcyj1A7PLOA/Q0DiKbsPsCTHD/0e+u+Zc 80RhLFys2rUlr17NMipPx4AjdIQvwE/lz8DnLvn0fkRQFtrxc0uBRQdZGgC4IyvK QCEQxAkz5oa3o5pJdskGNAZvb1S1N5+TvMURweGCMwouE23v8yVuAjmTYIofKbcW JLuGrgNG2yfOvrEuyW0tuRuIqr6j6HAHVsxV52J8v00bioUzDj7CTBLfb9MTZuhp RDXyaQl07K5DjrL6zerA02oyD9IqBTqbWXFev/TI5L4HkqmJoL6ssTYVo0iTfk2F 8pfshkZVUqYrOBUoHmND0VVJf//3SBgkBQi7ABEBAAG0IE1hdHQgSG91c2ggPGph ZWdlckBtb3JwaGV1cy5uZXQ+iQFUBBMBCAA+FiEEhAT4Ne50q1CKX5lzp/6C1kRx v8wFAlsHSwQCGwMFCQHhM4AFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQp/6C 1kRxv8wWgQf/RK8LQfPjggjtG2OxsxF3QMovRzSONVhxsY9oZAc8aSsRCxxoWXs7 K0vwIlO8Q4Xc5dXIVg3R1+jnL6Ht82ylc9PQiBbYo9k/uMbOaXyvd+AlNsuUn19B 3Ee70kF3WpkUTL1rAgJKjqtUJsyImFk7ngmvgpbAqB1/Daowbo49sFuOPvqgZCqJ sFdgtv/3HKVyVf5ttZ9jka+bUhn1zwQ8k27YRjfv2tbHU3hg5cI5RL5FjjXLEOEB oYhk//lKuKvzLStnsnsPHpeqCP4uFqA2WE3MJN2hRBjUf4QpZVgRu/u+2h0BBxzI iK+7SYGz9ZPeVMaeBogFIzu6t9hAh30XSrkBDQRbB0sDAQgAsB8xv75CK83MMFUX A/79RH4vTYF8uiiaiMX8/cqCUmtmjI7ukMk4UpaaVVyacP5xjAeFFwf9aQH32Liq 3YR0P6nRYf5cAGwVcBTUdbnzK9um/my7sZkdftff7CC7Np0/PCik3RUGtYtqX1CE mWEe0iu7ObKDgnP+qtwrWU2S0G+eduaYtmPTtokwYNKo/Z2vZENh/dnER9sn19ti OT6fT6uabvwf2lUYaoKBoehttnj7/9jeFWI+D2Nx4u+15u6yxtmRdaPSMbsOuhDS U5j0ugugauQoMKG26nrg1/3h55D0cHOd7uBlEKVEc28xTZ8sTlLR60wMfVQqcbrZ j5eNbwARAQABiQE8BBgBCAAmFiEEhAT4Ne50q1CKX5lzp/6C1kRxv8wFAlsHSwMC GwwFCQHhM4AACgkQp/6C1kRxv8xqIAgAkA3oIh8toz7Fe5haP7e4g3NY27/HvR0D ShLeMO53LzoQ1M0ZaS+XY9IKGyB6CKg0N3HyKt0h/b6+KabrGIAKkkngMPwCm0Db Bl9ip3tgu0YMoMIWwPimx0YGxlDHc6+hFHh8k/JWzV7BN+OmvyZxYAGUXa3pnhQd ev4VtI51mgz8qj9eXxE9YmNxXfd1l/bPx9A4mEFvq71dibWrLgh3r0aSBq7ZMlPC ehBECWuBnW9OMtFVvlcuoZ/2lO85CH6sYsi6yymxNdL3IW1kifk8OdPKARnzkMGo jEr2yP1JhBXLDhchK9c/KZUtWDeaIM3YDNEYtDgUjt0w5WIYkcMqBQ=3D=3D =3D7A3Q -----END PGP PUBLIC KEY BLOCK----- --------------594DC1D2DB210F901C08E6E8-- ]