diff options
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg-devel/distinfo | 6 | ||||
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch | 33 |
4 files changed, 39 insertions, 5 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index dff9f494e8a9..adb854900249 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= pkg -DISTVERSION= 2.2.99.2 +DISTVERSION= 2.3.99.1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt PKGNAMESUFFIX= -devel @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd -GH_TAGNAME= cf0e11958 +GH_TAGNAME= 1814638b1 USE_LDCONFIG= ${PREFIX}/lib/compat/pkg HAS_CONFIGURE= yes diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo index 2255dfa4d0c1..72298c79a193 100644 --- a/ports-mgmt/pkg-devel/distinfo +++ b/ports-mgmt/pkg-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756888391 -SHA256 (freebsd-pkg-2.2.99.2-cf0e11958_GH0.tar.gz) = 045007f6134378c4b58cda92f30425bac280862c433e2c478bfa214ea8168088 -SIZE (freebsd-pkg-2.2.99.2-cf0e11958_GH0.tar.gz) = 16521501 +TIMESTAMP = 1761209341 +SHA256 (freebsd-pkg-2.3.99.1-1814638b1_GH0.tar.gz) = 9e41a96c955b0eb256a616507d0d0ef84d353820848dd3a717ac37e935cebca6 +SIZE (freebsd-pkg-2.3.99.1-1814638b1_GH0.tar.gz) = 16475101 diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index b5954452538d..6853583905d4 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,5 +1,6 @@ PORTNAME= pkg DISTVERSION= 2.3.1 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt diff --git a/ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch b/ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch new file mode 100644 index 000000000000..608f5e232fa1 --- /dev/null +++ b/ports-mgmt/pkg/files/patch-7ea9566835a82f111d7771f58168babc5e0dde6a.patch @@ -0,0 +1,33 @@ +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 |