8000 Update stacked: 7 packages by gominimal-pkgmgr-mgr[bot] · Pull Request #829 · gominimal/pkgs · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions packages/cups/0001-dest-enumeration-without-dnssd.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 23a183b63a4c94ae7cd0f36c63ee7eb905be60fd Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Mon, 5 Oct 2026 22:55:47 -0400
Subject: [PATCH] Fix destination enumeration without DNS-SD

Add the local destination fields used by cups_enum_dests to the non-DNS-SD callback data structure.

Fixes #1739

Signed-off-by: Rui Chen <rui@chenrui.dev>
---
cups/dest.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/cups/dest.c b/cups/dest.c
index dac26f119e..676470e70c 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -125,6 +125,8 @@ typedef struct _cups_getdata_s
{
int num_dests; /* Number of destinations */
cups_dest_t *dests; /* Destinations */
+ int num_local; /* Number of local cupsd queues */
+ cups_dest_t *local_dests; /* Local cupsd queues */
char def_name[1024], /* Default printer name, if any */
*def_instance; /* Default printer instance, if any */
} _cups_getdata_t;
11 changes: 9 additions & 2 deletions packages/cups/build.ncl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
let { Attrs, BuildSpec, Local, OutputData, OutputLib, Source, .. } = import "minimal.ncl" in
let patch = import "../patch/build.ncl" in
let base = import "../base/build.ncl" in
let toolchain = import "../toolchain/build.ncl" in
let make = import "../make/build.ncl" in
Expand All @@ -8,18 +9,24 @@ let openssl = import "../openssl/build.ncl" in
let zlib = import "../zlib/build.ncl" in
let glibc = import "../glibc/build.ncl" in

let version = "2.4.19" in
let version = "2.4.20" in
{
name = "cups",
build_deps = [
{ file = "build.sh" } | Local,
# cups 2.4.20 does not compile without DNS-SD (we build with no Avahi/mDNSResponder):
# dest.c uses _cups_getdata_t.num_local/local_dests, which 2.4.20 only declares in the
# DNS-SD variant of the struc 8000 t. Upstream OpenPrinting/cups#1739, fixed by #1740
# (a197d30 on 2.4.x, merged 2026-10-06). Drop this patch on the bump past 2.4.20.
{ file = "0001-dest-enumeration-without-dnssd.patch" } | Local,
{
url = "gs://minimal-staging-archives/cups-%{version}-source.tar.gz",
sha256 = "820984b12a67f98705785aae2dd1347fe0ac097828001d4583ff64574aed6389",
sha256 = "ab4d9cd7f3e58060091d2b24972223d6401675f11c49b65abf4f6ef31dea22ff",
extract = true,
strip_prefix = "cups-%{version}",
} | Source,
base,
patch,
make,
toolchain,
pkgconf,
Expand Down
3 changes: 3 additions & 0 deletions packages/cups/build.sh
10BC8
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export CFLAGS="$MARCH -O2 -pipe -gno-record-gcc-switches -ffile-prefix-map=$(pwd
export LDFLAGS="-Wl,--build-id=none"
export CXXFLAGS="${CFLAGS}"

# Upstream fix for the 2.4.20 no-DNS-SD build break (OpenPrinting/cups#1740); see build.ncl.
patch -Np1 -i ./0001-dest-enumeration-without-dnssd.patch

./configure --prefix=/usr \
--disable-static \
--with-tls=openssl \
Expand Down
2 changes: 1 addition & 1 deletion packages/prettier/build.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let { subsetOf, Attrs, BuildSpec, Local, Needs, OutputBin, OutputData, .. } = im
let base = import "../base/build.ncl" in
let node-lts = import "../node-lts/build.ncl" in
let coreutils = import "../coreutils/build.ncl" in
let version = "3.9.8" in
let version = "3.9.9" in
{
name = "prettier",
build_deps = [
Expand Down
8 changes: 4 additions & 4 deletions packages/prettier/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/prettier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"prettier": "3.9.8"
"prettier": "3.9.9"
}
}
4 changes: 2 additions & 2 deletions packages/shadow/build.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ let libxcrypt = import "../libxcrypt/build.ncl" in
let pkgconf = import "../pkgconf/build.ncl" in
let toolchain = import "../toolchain/build.ncl" in

let version = "4.20.2" in
let version = "4.20.3" in
{
name = "shadow",
build_deps = [
{ file = "build.sh" } | Local,
{
url = "gs://minimal-staging-archives/shadow-%{version}.tar.xz",
sha256 = "b89f432b75ae55a2d852b446d0365484795fdf533ab97d550e325fa15594a224",
sha256 = "623be9429f64fa2165bfc5957c6a642ec309c5cf23c0d53855c99f7591922297",
} | Source,
base,
make,
Expand Down
4 changes: 2 additions & 2 deletions packages/stress-ng/build.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let acl = import "../acl/build.ncl" in
let gmp = import "../gmp/build.ncl" in
let mpfr = import "../mpfr/build.ncl" in
let xz = import "../xz/build.ncl" in
let version = "0.21.04" in
let version = "0.22.01" in
{
name = "stress-ng",
build_deps = [
Expand All @@ -34,7 +34,7 @@ let version = "0.21.04" in
xz,
{
url = "gs://minimal-staging-archives/ColinIanKing/stress-ng/V%{version}.tar.gz",
sha256 = "a328ba050bd3014f07a3265fb6c1aab071ae942dfad75c7459cce45a987869e1",
sha256 = "67e75894da3f634b85992069b0a888893221a77a3db5e3293cdddd0b1c0d4705",
extract = true,
strip_prefix = "stress-ng-%{version}",
} | Source,
Expand Down
4 changes: 2 additions & 2 deletions packages/syft/build.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ let go = import "../go/build.ncl" in
let toolchain = import "../toolchain/build.ncl" in
let glibc = import "../glibc/build.ncl" in

let version = "1.52.0" in
let version = "1.54.1" in
{
name = "syft",
build_deps = [
{ file = "build.sh" } | Local,
{
url = "gs://minimal-staging-archives/anchore/syft/v%{version}.tar.gz",
sha256 = "8b999a1b8bd08b12512176cdec5d063db9cfe209c65cc5de9c4eb2ab7bdc7b3c",
sha256 = "e3a8b41ef4050665edb7cb35bea1ffe49ab7bbdd3127e756ea7cf979d41e9dd5",
extract = true,
strip_prefix = "syft-%{version}",
} | Source,
Expand Down
8 changes: 2 additions & 6 deletions packages/trivy/build.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,22 @@ let { Attrs, BuildSpec, Local, Needs, OutputBin, Source, .. } = import "minimal.
let base = import "../base/build.ncl" in
let go = import "../go/build.ncl" in
let toolchain = import "../toolchain/build.ncl" in
let patch = import "../patch/build.ncl" in
let glibc = import "../glibc/build.ncl" in

let version = "0.74.0" in
let version = "0.75.0" in
{
name = "trivy",
build_deps = [
{ file = "build.sh" } | Local,
# Go 1.27 json/v2 compile fix backported from upstream main; see the patch.
{ file = "go127-json-skipfunc.patch" } | Local,
{
url = "gs://minimal-staging-archives/aquasecurity/trivy/v%{version}.tar.gz",
sha256 = "04268af574690b84bc3474a5f19e002cd6da3e16899fac9fd39c6e84e7843940",
sha256 = "4ee2010384f90bf23d4059ae49c11129e5041816a3754d890a90ae80f678d765",
extract = true,
strip_prefix = "trivy-%{version}",
} | Source,
base,
go,
toolchain,
patch,
],

needs =
Expand Down
6 changes: 3 additions & 3 deletions packages/trivy/build.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
set -ex

# Go 1.27 json/v2 fix (upstream trivy dc3c56eed5), applied by name and proven
# to have landed. Drop at the next trivy release.
patch -Np1 -i go127-json-skipfunc.patch
# Go 1.27 json/v2: trivy 0.75.0 includes upstream dc3c56eed5, so the backported
# go127-json-skipfunc.patch was dropped (it reported every hunk as already applied).
# The guard below still proves no Go-1.26-only json/v2 usage remains.
# Fail if ANY Go-1.26-only json/v2 usage survives anywhere in t 10BC8 he tree, not
# just the lines this patch touches.
# One grep (no pipe): its exit status alone means "a match exists", which is
Expand Down
61 changes: 0 additions & 61 deletions packages/trivy/go127-json-skipfunc.patch

This file was deleted.

2 changes: 1 addition & 1 deletion packages/vlt/build.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ let { standaloneTest, subsetOf, Attrs, BuildSpec, Local, Needs, OutputBin, Outpu
let base = import "../base/build.ncl" in
let node-lts = import "../node-lts/build.ncl" in
let coreutils = import "../coreutils/build.ncl" in
let version = "1.3.6" in
let version = "1.3.7" in
{
name = "vlt",
build_deps = [
Expand Down
8 changes: 4 additions & 4 deletions packages/vlt/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/vlt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"vlt": "1.3.6"
"vlt": "1.3.7"
}
}
Loading
0