diff --git a/ChangeLog b/ChangeLog index e112bf6..4a944f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,15 @@ # Copyright 2002-2005 Gentoo Technologies, Inc.; Distributed under the GPL v2 # $Header: $ +*cfg-update-1.11.0 (2026-07-28) + + Safety checks added during all merges to prevent editing of any file versions + other than the leftmost one. This was always intended behavior but lacked + safeguards previously. Hashes are also checked to detect changes made + outside of cfg-update. These will still be preserved but will not be + relied upon in future automatic merges. The next clean package update + will return automatic merge behavior for that package. + *cfg-update-1.10.4 (2026-06-20) Drop gtkdiff and imediff2 merge-tool support; align merge-tool lists in diff --git a/README.md b/README.md index 9b1354d..f511e3a 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Feedback is welcome. A safe, staged alternative to Gentoo's `etc-update` for handling configuration file updates after package merges. -**Version:** 1.10.4 +**Version:** 1.11.0 **License:** GPL-2 ([COPYING](COPYING)) ## Description diff --git a/cfg-update b/cfg-update index 9378dca..9127890 100755 --- a/cfg-update +++ b/cfg-update @@ -35,7 +35,7 @@ $Term::ANSIColor::AUTORESET = 1; ###################################################################################################################### # Setting program variables... - my $version = "1.10.4"; + my $version = "1.11.0"; my $progname = basename($0); my $debug = "2>/dev/null"; my $website = "https://github.com/rich0/cfg-update"; diff --git a/docs/DEPENDENCIES.md b/docs/DEPENDENCIES.md index a659033..1ceb004 100644 --- a/docs/DEPENDENCIES.md +++ b/docs/DEPENDENCIES.md @@ -122,10 +122,10 @@ Run from a git checkout (no root required): ./test/run-tests.sh ``` -Gentoo ebuild ([`gentoo/cfg-update-1.10.4.ebuild`](../gentoo/cfg-update-1.10.4.ebuild)): +Gentoo ebuild ([`gentoo/cfg-update-1.11.0.ebuild`](../gentoo/cfg-update-1.11.0.ebuild)): ```bash -FEATURES=test USE=test emerge --oneshot /path/to/gentoo/cfg-update-1.10.4.ebuild +FEATURES=test USE=test emerge --oneshot /path/to/gentoo/cfg-update-1.11.0.ebuild ``` | Requirement | Gentoo package | Used in | @@ -161,7 +161,7 @@ grep -q 'cfg-update --index' /etc/portage/bashrc && echo "hook OK" A reference ebuild is maintained in [`gentoo/`](../gentoo/). Install with: ```bash -FEATURES=test USE=test emerge --oneshot /path/to/gentoo/cfg-update-1.10.4.ebuild +FEATURES=test USE=test emerge --oneshot /path/to/gentoo/cfg-update-1.11.0.ebuild ``` Or from the Gentoo tree: `emerge app-portage/cfg-update`. diff --git a/docs/INVENTORY.md b/docs/INVENTORY.md index 913360f..95a32e1 100644 --- a/docs/INVENTORY.md +++ b/docs/INVENTORY.md @@ -2,7 +2,7 @@ **Updated:** 2026-06-20 (issue #29) **Repo:** [rich0/cfg-update](https://github.com/rich0/cfg-update) -**Version:** 1.10.4 +**Version:** 1.11.0 **Target usage:** Single-host Gentoo with Portage (`emerge`); Paludis best-effort --- @@ -23,7 +23,7 @@ The repository has **no language-level lockfile** (no `package.json`, `cpanfile` | [`cfg-update.conf`](../cfg-update.conf) | 166 | Config template (installed as `/etc/cfg-update.conf`) | | [`cfg-update.8`](../cfg-update.8) | 149 | Man page | | [`cfg-update_indexing`](../cfg-update_indexing) | 12 | Paludis hook script (copied to `/usr/share/paludis/hooks/...`) | -| [`gentoo/cfg-update-1.10.4.ebuild`](../gentoo/cfg-update-1.10.4.ebuild) | — | Reference Gentoo ebuild with `src_test()` | +| [`gentoo/cfg-update-1.11.0.ebuild`](../gentoo/cfg-update-1.11.0.ebuild) | — | Reference Gentoo ebuild with `src_test()` | | [`ChangeLog`](../ChangeLog) | — | Gentoo ebuild changelog (historical) | | [`COPYING`](../COPYING) | — | GPL v2 | | [`test/run-tests.sh`](../test/run-tests.sh) | — | Integration test harness (Tiers 0–F) | @@ -220,7 +220,7 @@ See [DEPENDENCIES.md](DEPENDENCIES.md) for install commands. Summary: | Package | Purpose | |---------|---------| -| `app-portage/cfg-update` | Install via [`gentoo/cfg-update-1.10.4.ebuild`](../gentoo/cfg-update-1.10.4.ebuild) | +| `app-portage/cfg-update` | Install via [`gentoo/cfg-update-1.11.0.ebuild`](../gentoo/cfg-update-1.11.0.ebuild) | | `sys-apps/findutils` | `xargs` for index build | | `dev-util/meld` (recommended) | Default merge tool | | `dev-perl/Term-ANSIColor`, `dev-perl/TermReadKey` | Perl deps | diff --git a/gentoo/cfg-update-1.10.4.ebuild b/gentoo/cfg-update-1.11.0.ebuild similarity index 100% rename from gentoo/cfg-update-1.10.4.ebuild rename to gentoo/cfg-update-1.11.0.ebuild