Created attachment 187868 [details] patch against head Attached patch against is intended to reject non-matching patches with limited context rather than apply them incorrectly. There was some fallout from this (r325365) and the commit has been converted. Please run an exp-run to figure out the extent of the fallout. =)
A commit references this bug: Author: antoine Date: Thu Nov 9 20:09:19 UTC 2017 New revision: 453865 URL: https://svnweb.freebsd.org/changeset/ports/453865 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/devel/cppcheck/files/patch-CMakeLists.txt head/devel/cppcheck/files/patch-gui_CMakeLists.txt head/devel/p5-Config-Auto/files/patch-Makefile.PL head/graphics/ImageMagick/files/patch-config_policy.xml head/graphics/ImageMagick7/files/patch-config_policy.xml head/japanese/esecanna/files/patch-README.jp head/lang/tcl84/files/patch-warnings head/www/py-gunicorn/files/patch-requirements__test.txt head/x11/rxvt-unicode/files/patch-src_gencompose head/x11/rxvt-unicode/files/patch-src_genlinedraw
A commit references this bug: Author: antoine Date: Thu Nov 9 20:17:22 UTC 2017 New revision: 453866 URL: https://svnweb.freebsd.org/changeset/ports/453866 Log: Regenerate patch-warnings so that it applies with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/devel/tcllib/files/patch-warnings
A commit references this bug: Author: antoine Date: Thu Nov 9 20:45:05 UTC 2017 New revision: 453869 URL: https://svnweb.freebsd.org/changeset/ports/453869 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/biology/tinker/files/patch-bench__bench1.run head/biology/tinker/files/patch-bench__bench2.run head/java/eclipse/files/patch-submodules
A commit references this bug: Author: antoine Date: Thu Nov 9 22:17:08 UTC 2017 New revision: 453874 URL: https://svnweb.freebsd.org/changeset/ports/453874 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/cad/meshlab/files/patch-common_common.pro head/cad/qcad/files/patch-src_core_RS.cpp head/databases/postgresql-libpqxx3/files/patch-svn_1833 head/emulators/pcsxr/files/patch-pixmaps-Makefile.am head/games/blockout/Makefile head/graphics/dia/files/patch-app_main.c head/graphics/dia/files/patch-doc_fr_Makefile.in head/www/domoticz/files/patch-appversion.default head/x11-themes/murrine-configurator/files/patch-files__murrine-configurator head/x11-toolkits/hs-wx/Makefile head/x11-toolkits/hs-wx/files/patch-src_Graphics_UI_WX_Window.hs
A commit references this bug: Author: antoine Date: Thu Nov 9 23:12:04 UTC 2017 New revision: 453879 URL: https://svnweb.freebsd.org/changeset/ports/453879 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/comms/birda/files/patch-lib-Makefile
(In reply to Kyle Evans from comment #0) I have a small concern here: patch(1) should be able to apply any patch generated by diff(1). For the ports tree, in particular, it seems critical that anything generated with "make makepatch" (diff -upn if I remember well) should always work with patch(1). I looked at some of the ports that are affected and portlint does complain about the original patches: if it's just old patches that still apply by sheer luck then it's OK, otherwise we shouldn't have to use specific diff flags to generate valid patches.
A commit references this bug: Author: antoine Date: Fri Nov 10 07:10:35 UTC 2017 New revision: 453885 URL: https://svnweb.freebsd.org/changeset/ports/453885 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/comms/morse/files/patch-QSO.1 head/databases/mongodb32-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go head/databases/mongodb34-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go head/sysutils/mapchan/files/patch-examples__default
A commit references this bug: Author: antoine Date: Fri Nov 10 17:33:31 UTC 2017 New revision: 453906 URL: https://svnweb.freebsd.org/changeset/ports/453906 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/net/openmq/files/patch-imqbrokerd
A commit references this bug: Author: antoine Date: Fri Nov 10 19:15:32 UTC 2017 New revision: 453924 URL: https://svnweb.freebsd.org/changeset/ports/453924 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/devel/py-pykdeuic4/files/patch-CMakeLists.txt
A commit references this bug: Author: antoine Date: Sat Nov 11 07:11:38 UTC 2017 New revision: 453953 URL: https://svnweb.freebsd.org/changeset/ports/453953 Log: Fix the context of some patches so that they apply with stricter patch(1) PR: 223545 With hat: portmgr Changes: head/net/tcpick/files/patch-src_lookup.h head/net-mgmt/librenms/files/patch-poller-wrapper.py
Exp-run looks fine. Could you send an email to notice about this change and ask committers to test with the newer version of patch(1) before committing?
(In reply to Antoine Brodin from comment #11) An e-mail to freebsd-ports@, or is there a more appropriate place?
A commit references this bug: Author: kevans Date: Wed Nov 22 03:44:20 UTC 2017 New revision: 326084 URL: https://svnweb.freebsd.org/changeset/base/326084 Log: patch(1): don't assume a match if we run out of context to check Patches with very little context (-U0 and -U1) could get misapplied if the file to be patched changes and a hunk is no longer applicable. Matching with fuzz would be attempted and default to a match when we unexpectedly ran out of context. This also affected patches with higher levels of context but had limited actual context due to the hunk being located near the beginning/end of file. PR: 74127, 223545 (exp-run) Reviewed by: emaste, pfg Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D12631 Changes: head/usr.bin/patch/patch.c
A commit references this bug: Author: antoine Date: Thu Jan 25 06:43:53 UTC 2018 New revision: 459908 URL: https://svnweb.freebsd.org/changeset/ports/459908 Log: Fix the context of this patch so that its applies with stricter patch(1) PR: 223545 Changes: head/devel/dub/files/patch-source-dub_version-d
A commit references this bug: Author: antoine Date: Thu Jan 25 06:44:59 UTC 2018 New revision: 459909 URL: https://svnweb.freebsd.org/changeset/ports/459909 Log: MFH: r459908 Fix the context of this patch so that its applies with stricter patch(1) PR: 223545 Changes: _U branches/2018Q1/ branches/2018Q1/devel/dub/files/patch-source-dub_version-d
Closing this, since I think all cases have been hammered out.
A commit references this bug: Author: antoine Date: Mon Mar 19 13:07:26 UTC 2018 New revision: 465011 URL: https://svnweb.freebsd.org/changeset/ports/465011 Log: Fix patch context so it applies with stricted patch(1) PR: 223545 Changes: head/devel/dub/files/patch-source-dub_version-d