Repository navigation
Ship bashbug, libtool-next-version, xml2-config and xslt-config (world rebuild) - #1443
Conversation
Low-level half of the bin-coverage audit (#1436 was the leaf half). Each build already runs upstream's install step, which installs these four scripts into usr/bin; our outputs named the other binaries one by one, so these were dropped. - bash: bashbug (Makefile.in .made and install targets). #!/bin/sh, and the sh it needs is bash itself, so allow_missing_interpreter. - libtool: libtool-next-version (Makefile.am bin_SCRIPTS). Its /bin/sh comes from the bash runtime dep. - libxml2: xml2-config (CMakeLists.txt install(PROGRAMS)), and libxslt: xslt-config (likewise); both #!/bin/sh with no sh runtime dep, so allow_missing_interpreter, as #1436 did for jemalloc.sh. Checked and left out: sqlite's sqldiff/sqlite3_rsync (not in the autoconf amalgamation tarball we build), cmake's ccmake (needs curses, which cmake does not depend on), tcl's bare tclsh (upstream installs only tclsh8.6), zstd's pzstd (contrib/, not installed by make install). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Warning Review limit reached
This review includes 4 billable files and costs up to $1.00.
Reviews can continue after your included limit without a manual trigger. An admin must approve usage-based billing. Or wait 14 minutes for your next included review. View limit details
|
There was a problem hiding this comment.
Scope matches the title. The diff adds four OutputBin entries and one comment, in the four packages that the body names. Clobber none found. The diff only adds lines. The recent history (#1436, #1411) touches other outputs. I did not run git log per file because the harness gave no shell. Correctness The globs match the install paths that the body cites. The allow_missing_interpreter use follows the repo pattern (curl-config, pcre2-config, freetype-config, jemalloc.sh). libtool-next-version gets /bin/sh from the existing bash runtime dep. The main risk is in bashbug. Upstream's make rule writes $(CCFLAGS) into the script, and our CFLAGS holds -ffile-prefix-map=$(pwd)=/builddir. Thus the shipped script contains the absolute sandbox build path. The xml2-config/xslt-config consumer behaviour change is real, and the PR body states it. The world rebuild is the right check for it. Not checked (no build, no shell): the bytes of the built bashbug, xml2-config and xslt-config. I also did not check whether consumers such as lxml or PHP now pick up xml2-config before pkg-config.
| bash = { glob = "usr/bin/bash" } | OutputBin, | ||
| sh = { glob = "usr/bin/sh" } | OutputBin, | ||
| # #!/bin/sh script; the sh it needs is this package, which cannot be its own runtime dep. | ||
| bashbug = { glob = "usr/bin/bashbug", allow_missing_interpreter = true } | OutputBin, |
There was a problem hiding this comment.
low · bashbug now ships, and upstream bakes the compile flags into it. The bashbug make rule replaces !CFLAGS! in support/bashbug.sh with $(CCFLAGS). Our build.sh puts -ffile-prefix-map=$(pwd)=/builddir into CFLAGS. So the shipped script contains the absolute sandbox build directory, which is the path that flag exists to remove. If that directory is not the same for every build, bashbug is not byte-reproducible, and it sits in base. Check one built output: grep -n CFLAGS usr/bin/bashbug. If the path is there, rewrite it after install in build.sh, for example sed -i "s|$(pwd)|/builddir|g" "$OUTPUT_DIR/usr/bin/bashbug". No other package in the repo scrubs this. This is the only instance in the diff.
| outputs = { | ||
| xmllint = { glob = "usr/bin/xmllint" } | OutputBin, | ||
| xmlcatalog = { glob = "usr/bin/xmlcatalog" } | OutputBin, | ||
| "xml2-config" = { glob = "usr/bin/xml2-config", allow_missing_interpreter = true } | OutputBin, |
There was a problem hiding this comment.
nit · xml2-config here and xslt-config in packages/libxslt/build.ncl:39 turn off the interpreter lint without a reason. The bashbug line in this PR has one. Most single-script siblings also have one, for example packages/nspr/build.ncl and packages/libgcrypt/build.ncl:41. Add one line, for example # #!/bin/sh script; consumers are builds, which always have a shell.
Low-level half of the bin-coverage audit; #1436 was the leaf half. Each of these builds already runs upstream's install step, and these four scripts land in
usr/bin. The outputs named the other binaries one by one, so these were silently dropped.Rebuilds: 575 (a world rebuild; bash is in
base). Queue it on its own night, not next to another world rebuild.Added
bashbugMakefile.in:630(.madebuilds it),:918(installinstalls it; ourinstall-stripcallsinstall)#!/bin/sh -; the sh is bash itself, which can't be its own runtime dep →allow_missing_interpreterlibtool-next-versionMakefile.am:286/Makefile.in:762(bin_SCRIPTS, unconditional)#! /bin/sh, satisfied by the existingbashruntime depxml2-configCMakeLists.txt:800-801(install(PROGRAMS …), unconditional on non-Windows)#! /bin/sh, no sh runtime dep →allow_missing_interpreter(as #1436 did forjemalloc.sh)xslt-configCMakeLists.txt:554-555Sources: the gs:// tarballs were sha256-verified against build.ncl. libxml2/libxslt were read from a clone of the pinned tag, because GitHub's archive bytes can't be fetched here to compare the sha.
One behavior note: with
xml2-config/xslt-configon PATH, a consumer's configure that prefers them over pkg-config will now find them. For shared builds--libsprints just-lxml2/-lxslt -lxml2, the same set pkg-config gives, so I don't expect breakage. The world rebuild will show it if there is any.Checked and left out
sqldiff,sqlite3_rsynctool/sources and itsMakefile.ininstalls onlysqlite3. Shipping them means switching to the fullsqlite-srczip, which is a separate change.ccmakeSource/Checks/Curses.cmakefinds curses + form, and cmake has no ncurses dep. Adding one grows cmake's closure for a TUI; that's a decision, not a dropped file.tclshtclsh8.6(unix/Makefile.in:817); the baretclshlink is a distro convention (LFS/Arch add it).pzstdcontrib/pzstd; the top-level andprograms/Makefileinstalltargets don't install it.nickel formatrun on every edited file.🤖 Generated with Claude Code