aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2025-11-04 07:59:56 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2025-11-04 08:01:36 +0000
commit8a541f9f942563e0cdda75e0c211b2a362b614cc (patch)
tree48f8634644b1ff318bf32f88b7d1333dd0817d22
parent0cebd42d1ea89eb2d13e8187e220563630a5c07d (diff)
ports-mgmt/pkg: update to 2.4.1
Changes from 2.4.0 to 2.4.1 - Fix 32bit regression - cleanup trigger(5) manpage - fix a crash during 3 way merge Changes form 2.3.0 to 2.4.0 - Use line buffering for the metalog file handle - Fix bug making pkg delete too many directories in case of split upgrades - BACKUP_LIBRARIES now create one backup package per source package - new metalog_copy lua function to create entries in the metalog cloning metadata from another file - New OSVF Parser - New CPE Parser/Emitter - Lots of code cleanup and simplification - Add support for system triggers (triggers in /usr/share/pkg/triggers) - pkg check now respects -r (rootdir) - relax ABI checking - Lots of improvements and bugs fixes regaring BACKUP_LIBRARIES features - Integrate BACKUP_LIBRARIES in the solver - Add vital flag to the list of flag which we need to consider for package reinstallation - tack uname, gname, mtime, permissions and fflags in the db and in the manifest instead of relying on the tar informations. which gives us pkg check -m to check for for metadata changes. - METALOG: add entries for intermediate directories - better 404 reporting - fix return code for pkg upgrade -n - new pkg sets alias example in default pkg.conf - new DEBUG_SCHEDULER_DOT_FILE option to generate a graphviz DOT format for the job graph - loosen ordering for upgrade jobs (reduces a lot the number of split upgrades and speed up the scheduler on setup with large number of packages.) Pr: 290659 Exp-run: antoine
-rw-r--r--ports-mgmt/pkg/Makefile3
-rw-r--r--ports-mgmt/pkg/distinfo6
-rw-r--r--ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch33
3 files changed, 4 insertions, 38 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 6853583905d4..15356f97bbfb 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,6 +1,5 @@
PORTNAME= pkg
-DISTVERSION= 2.3.1
-PORTREVISION= 1
+DISTVERSION= 2.4.1
_PKG_VERSION= ${DISTVERSION}
CATEGORIES= ports-mgmt
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 072906862918..e20f22ab64d9 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1757519200
-SHA256 (freebsd-pkg-2.3.1_GH0.tar.gz) = 59dc9e1dfaab9d24715738df10d845d39c0143b148eb15964e9dffe0b2447aca
-SIZE (freebsd-pkg-2.3.1_GH0.tar.gz) = 16448525
+TIMESTAMP = 1762242970
+SHA256 (freebsd-pkg-2.4.1_GH0.tar.gz) = 788da933d95f8da99da0f99374623808ac87e2c456b8387de496379658a891ca
+SIZE (freebsd-pkg-2.4.1_GH0.tar.gz) = 16474321
diff --git a/ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch b/ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch
deleted file mode 100644
index 608f5e232fa1..000000000000
--- a/ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7ea9566835a82f111d7771f58168babc5e0dde6a Mon Sep 17 00:00:00 2001
-From: Mark Johnston <markj@FreeBSD.org>
-Date: Thu, 23 Oct 2025 21:54:36 +0000
-Subject: [PATCH] libpkg: Use line buffering for the metalog file handle
-
-Otherwise we can get interleaved metalog entries when a package
-install script appends entries to the metalog as well.
-
-Reported by: cperciva
----
- libpkg/metalog.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libpkg/metalog.c b/libpkg/metalog.c
-index 9ffac87ae7..07b7419b66 100644
---- libpkg/metalog.c
-+++ libpkg/metalog.c
-@@ -37,11 +37,11 @@ int
- metalog_open(const char *metalog)
- {
- metalogfp = fopen(metalog, "ae");
-- if (metalogfp == NULL) {
-+ if (metalogfp == NULL)
- pkg_fatal_errno("Unable to open metalog '%s'", metalog);
-- }
--
-- return EPKG_OK;
-+ /* Package install scripts may add entries, so avoid interleaving. */
-+ setvbuf(metalogfp, NULL, _IOLBF, 0);
-+ return (EPKG_OK);
- }
-
- int