From 3735bf4c4eef7d35e824d0f84caf3e110915ddf3 Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Wed, 29 Oct 2025 16:33:07 -0400 Subject: [PATCH] =?UTF-8?q?Fix=20util=5Flinux=20build,=20rebuild=20pcre2,?= =?UTF-8?q?=20fix=20install.sh=20hash=20checking,=20etc=20=E2=80=94=20pcre?= =?UTF-8?q?2=20=E2=86=92=2010.47-1,util=5Flinux=20=E2=86=92=202.41.2=20(#1?= =?UTF-8?q?3251)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add unbuilt util_linux to updater-util_linux-2.41.2 * Move to meson WIP. Signed-off-by: Satadru Pramanik * WIP util-linux changes. See also https://github.com/util-linux/util-linux/issues/3763 for upstream build failure report. Signed-off-by: Satadru Pramanik * Update to latest commit from stable/v2.4.1 branch. Signed-off-by: Satadru Pramanik * Fix util_linux build using 5.10 linux headers, rebuild pcre2. Signed-off-by: Satadru Pramanik * Let gitlab_pkginfo handle build packages, fix download of build packages, fix debug aliases, fix crew const not working in a repo root. Signed-off-by: Satadru Pramanik * Update arm binaries for util_linux. Signed-off-by: Satadru Pramanik * Fix cached archive download_check in installer.sh Signed-off-by: Satadru Pramanik * bump version Signed-off-by: Satadru Pramanik --------- Signed-off-by: Satadru Pramanik Co-authored-by: chromebrew-actions[bot] --- bin/crew | 24 +++++++++---- commands/const.rb | 2 +- install.sh | 32 ++++++++++++----- lib/const.rb | 2 +- lib/package_utils.rb | 12 +++++-- manifest/armv7l/p/pcre2.filelist | 2 +- manifest/armv7l/u/util_linux.filelist | 50 ++++++++++++--------------- manifest/i686/p/pcre2.filelist | 2 +- manifest/i686/u/util_linux.filelist | 47 ++++++++++++------------- manifest/x86_64/p/pcre2.filelist | 2 +- manifest/x86_64/u/util_linux.filelist | 50 ++++++++++++--------------- packages/pcre2.rb | 12 +++---- packages/util_linux.rb | 43 +++++++++++------------ 13 files changed, 150 insertions(+), 130 deletions(-) diff --git a/bin/crew b/bin/crew index 0e67833d9..4433f7874 100755 --- a/bin/crew +++ b/bin/crew @@ -22,6 +22,16 @@ Dir.glob("#{__dir__}/../commands/*.rb") { |cmd| require_relative cmd } require_relative '../lib/const' require_relative '../lib/crew_lockfile' require_gem 'pry-byebug' if CREW_DEBUG +if defined?(PryByebug) + Pry.commands.alias_command 'c', 'continue' + Pry.commands.alias_command 's', 'step' + Pry.commands.alias_command 'n', 'next' + Pry.commands.alias_command 'f', 'finish' + # Hit Enter to repeat last command + Pry::Commands.command(/^$/, 'repeat last command') do + pry_instance.run_command Pry.history.to_a.last + end +end # Debugging starts at the following breakpoint when enabled via crew # being started with a --debug flag. # The following line can be used anywhere as a breakpoint. @@ -483,7 +493,7 @@ def download # Do an early check for a missing binary package and if so rebuild. if !@pkg.source?(@device[:architecture]) && @pkg.superclass.to_s == 'Pip' - if `curl -sI #{test_url}`.lines.first.split[1] == '200' && PackageUtils.get_gitlab_pkginfo(@pkg.name, @pkg.version, ARCH)[:pkg_sha256] == sha256sum + if `curl -sI #{test_url}`.lines.first.split[1] == '200' && PackageUtils.get_gitlab_pkginfo(@pkg.name, @pkg.version, ARCH, false, false)[:pkg_sha256] == sha256sum url = test_url else url = 'SKIP' @@ -527,11 +537,10 @@ def download puts build_cache_url if CREW_VERBOSE puts "curl -fsI #{build_cache_url}" if CREW_VERBOSE if `curl -fsI #{build_cache_url}`.lines.first.split[1] == '200' - puts "curl -# --header \"#{CREW_GITLAB_TOKEN_LABEL}: GITLAB_TOKEN\" --upload-file \"#{build_cachefile}\" \"#{build_cache_url}\" | cat" if CREW_VERBOSE - gitlab_pkginfo = PackageUtils.get_gitlab_pkginfo(package, pkg_version, arch, true) + gitlab_pkginfo = PackageUtils.get_gitlab_pkginfo(@pkg.name, @pkg.version, @device[:architecture], true, true) gitlab_build_artifact_sha256 = gitlab_pkginfo[:pkg_sha256] gitlab_build_artifact_date = gitlab_pkginfo[:pkg_upload_date] - puts "Cached build artifact from #{gitlab_build_artifact_date} exists!".lightgreen + puts "Cached build artifact from #{gitlab_build_artifact_date} exists! with sha256 #{gitlab_build_artifact_sha256}".lightgreen puts "Downloading most recent cached build artifact for #{@pkg.name}-#{@pkg.version}...".orange # Download the package build artifact. downloader(build_cache_url, gitlab_build_artifact_sha256, build_cachefile, no_update_hash: true) @@ -1634,7 +1643,7 @@ def update_package_file(package = nil, pkg_version = nil, binary_compression = n remote_binary = `curl -fsI #{remote_binary_url}`.lines.first.split[1] == '200' next unless remote_binary puts "\e[1A\e[KRemote #{package} package binary exists for #{arch}.\r".green - binary_sha256_hash[arch.to_sym] = PackageUtils.get_gitlab_pkginfo(package, pkg_version, arch, true)[:pkg_sha256] + binary_sha256_hash[arch.to_sym] = PackageUtils.get_gitlab_pkginfo(package, pkg_version, arch, false, true)[:pkg_sha256] end # 5. Generate new or replacement binary_sha256 block and add to # package file. @@ -1781,7 +1790,7 @@ def upload(pkg_name = nil, pkg_version = nil, binary_compression = nil) # 3c. Check to see if an existing upload exists. puts "\e[1A\e[KChecking for existing upload ...\r".orange remote_binary = `curl -fsI #{new_url}`.lines.first.split[1] == '200' - gitlab_remote_binary_sha256 = PackageUtils.get_gitlab_pkginfo(package, new_version, arch, true)[:pkg_sha256] if remote_binary + gitlab_remote_binary_sha256 = PackageUtils.get_gitlab_pkginfo(package, new_version, arch, false, true)[:pkg_sha256] if remote_binary # 3d. Check for local binary. if local_tarfile.nil? || !File.file?(local_tarfile) @@ -1856,7 +1865,7 @@ def upload(pkg_name = nil, pkg_version = nil, binary_compression = nil) output = `curl -# --header "#{CREW_GITLAB_TOKEN_LABEL}: #{GITLAB_TOKEN}" --upload-file "#{local_tarfile}" "#{new_url}" | cat`.chomp puts "\e[1A\e[KChecking upload...\r".orange if output.include?('201 Created') - gitlab_new_upload_sha256 = PackageUtils.get_gitlab_pkginfo(package, new_version, arch, true)[:pkg_sha256] + gitlab_new_upload_sha256 = PackageUtils.get_gitlab_pkginfo(package, new_version, arch, false, true)[:pkg_sha256] if gitlab_new_upload_sha256 == local_sha256 puts "#{output}\n".lightgreen else @@ -2183,5 +2192,6 @@ if ARGV[0] != 'update' && Time.now.to_i - @last_update_check > (CREW_UPDATE_CHEC plural = CREW_UPDATE_CHECK_INTERVAL < 2 ? '' : 's' puts "It has been more than #{CREW_UPDATE_CHECK_INTERVAL} day#{plural} since crew was last updated. Please run 'crew update'.".lightpurple end +binding.pry if CREW_DEBUG command_name = args.select { |k, v| v && command?(k) }.keys[0] send("#{command_name}_command", args) diff --git a/commands/const.rb b/commands/const.rb index aedcc0839..3c87299d2 100644 --- a/commands/const.rb +++ b/commands/const.rb @@ -11,7 +11,7 @@ class Command else # Get all constants defined by const.rb constants = Object.constants.select do |const| - Object.const_source_location(const).first == File.join(CREW_LIB_PATH, 'lib/const.rb') + Object.const_source_location(const).first == File.realpath(File.join(__dir__, '../lib/const.rb')) end.sort # Print a sorted list of the remaining constants used by crew. diff --git a/install.sh b/install.sh index a1df23ed5..f76e54c60 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -CREW_INSTALLER_VERSION=2025082901 +CREW_INSTALLER_VERSION=2025102901 # Exit on fail. set -eE @@ -13,6 +13,23 @@ echo_success() { echo -e "\e[1;32m${*}${RESET}" >&1; } # Use Green for success m echo_intra() { echo -e "\e[1;34m${*}${RESET}" >&1; } # Use Blue for intrafunction messages. echo_out() { echo -e "\e[0;37m${*}${RESET}" >&1; } # Use Gray for program output. +this_installer=$(basename "$0") +case "${this_installer}" in + 63) + # We are being piped in. Assume we are being piped in from curl + # and echo the current installer date from github. + echo_info "Current Chromebrew Installer is from $(curl -s "https://api.github.com/repos/chromebrew/chromebrew/commits?path=install.sh&page=1&per_page=1" | jq -r '.[0].commit.committer.date')" + ;; + install.sh) + # The installer was manually downloaded or we are in a container + # image install. + echo_info "Current Chromebrew Installer is from $(curl -s "https://api.github.com/repos/chromebrew/chromebrew/commits?path=install.sh&page=1&per_page=1" | jq -r '.[0].commit.committer.date')" + echo_info "Installer ${this_installer} last modified at: $(stat -c %y "$0")" + ;; + *) + echo_info "Installer ${this_installer} last modified at: $(stat -c %y "$0")" + esac + # Add proper support for parsing /etc/lsb-release # Reference: https://www.chromium.org/chromium-os/developer-library/reference/infrastructure/lsb-release/ lsbval() { @@ -317,15 +334,12 @@ function download_check () { if [[ -f "$CREW_CACHE_DIR/${3}" ]] ; then echo_info "$CREW_CACHE_DIR/${3} found." echo_intra "Verifying cached ${1}..." - echo_success "$(echo "${4}" "$CREW_CACHE_DIR/${3}" | sha256sum -c -)" - case "${?}" in - 0) + if echo "${4}" "$CREW_CACHE_DIR/${3}" | sha256sum -c -; then + echo_success "Verification of cached ${1} succeeded." ln -sf "$CREW_CACHE_DIR/${3}" "$CREW_BREW_DIR/${3}" || true - return - ;; - *) - echo_error "Verification of cached ${1} failed, downloading." - esac + else + echo_error "Verification of cached $CREW_CACHE_DIR/${3} failed with sha256 ${4}, downloading." + fi else echo_intra "$CREW_CACHE_DIR/${3} not found" fi diff --git a/lib/const.rb b/lib/const.rb index 8b018cf83..738df36ef 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -4,7 +4,7 @@ require 'etc' require 'open3' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' -CREW_VERSION ||= '1.67.12' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION +CREW_VERSION ||= '1.67.13' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION # Kernel architecture. KERN_ARCH ||= Etc.uname[:machine] diff --git a/lib/package_utils.rb b/lib/package_utils.rb index c17eb4671..0c83ab395 100644 --- a/lib/package_utils.rb +++ b/lib/package_utils.rb @@ -100,7 +100,7 @@ class PackageUtils return pkg_version end - def self.get_gitlab_pkginfo(pkg_name, pkg_version, pkg_arch, verbose = nil) + def self.get_gitlab_pkginfo(pkg_name, pkg_version, pkg_arch, build = nil, verbose = nil) # This is largely rehashing self.get_binary_url(pkg) using the # curl and jq binaries for debugging purposes. # outputs are :pkg_file_name, :pkg_sha256, :pkg_upload_date :pkg_url @@ -115,13 +115,18 @@ class PackageUtils # abort "Gitlab upload at #{fallback_url} not found."lightred unless `curl -fsI "#{fallback_url}"`.lines.first.split[1] == '200' # What is the gitlab package binary PACKAGE_ID? + + crewlog 'curl -s --location \\' + crewlog "#{CREW_GITLAB_PKG_REPO}?package_type=generic&package_name=#{pkg_name}&package_version=#{pkg_version}_#{pkg_arch}#{'_build' if build}" gitlab_binary_pkg_id = `curl -s --location \ - "#{CREW_GITLAB_PKG_REPO}?package_type=generic&package_name=#{pkg_name}&package_version=#{pkg_version}_#{pkg_arch}" \ - | jq -r ".[] | select(.name==\\"#{pkg_name}\\" and .version==\\"#{pkg_version}_#{pkg_arch}\\") | .id"`.chomp + "#{CREW_GITLAB_PKG_REPO}?package_type=generic&package_name=#{pkg_name}&package_version=#{pkg_version}_#{pkg_arch}#{'_build' if build}" \ + | jq -r ".[] | select(.name==\\"#{pkg_name}\\" and .version==\\"#{pkg_version}_#{pkg_arch}#{'_build' if build}\\") | .id"`.chomp + crewlog "gitlab_binary_pkg_id is #{gitlab_binary_pkg_id}" if verbose # What is the hash of the gitlab package remote binary file name? pkg_file_name = `curl -s --location \ "#{CREW_GITLAB_PKG_REPO}/#{gitlab_binary_pkg_id}/package_files" \ | jq -r "last(.[].file_name)"`.chomp + crewlog "pkg_file_name is #{pkg_file_name}" if verbose # What is the hash of the gitlab package remote binary? pkg_sha256 = `curl -s --location \ "#{CREW_GITLAB_PKG_REPO}/#{gitlab_binary_pkg_id}/package_files" \ @@ -130,6 +135,7 @@ class PackageUtils pkg_upload_date = `curl -s --location \ "#{CREW_GITLAB_PKG_REPO}/#{gitlab_binary_pkg_id}/package_files" \ | jq -r "last(.[].created_at)"`.chomp + crewlog "pkg_upload_date is #{pkg_upload_date}" if verbose pkg_url = "#{CREW_GITLAB_PKG_REPO}/generic/#{pkg_name}/#{pkg_version}_#{pkg_arch}/#{pkg_file_name}" puts "\e[1A\e[K#{pkg_name.capitalize} #{pkg_version} has a#{'n' if pkg_arch.start_with?('a', 'e', 'i', 'o', 'u')} #{pkg_arch} upload on Gitlab.\n".green puts "\e[1A\e[K sha256: #{pkg_sha256}\n uploaded: #{pkg_upload_date}\n url: #{pkg_url}\n".orange if verbose diff --git a/manifest/armv7l/p/pcre2.filelist b/manifest/armv7l/p/pcre2.filelist index 855f51535..01a585381 100644 --- a/manifest/armv7l/p/pcre2.filelist +++ b/manifest/armv7l/p/pcre2.filelist @@ -1,4 +1,4 @@ -# Total size: 10751543 +# Total size: 10750743 /usr/local/bin/pcre2-config /usr/local/bin/pcre2grep /usr/local/include/pcre2.h diff --git a/manifest/armv7l/u/util_linux.filelist b/manifest/armv7l/u/util_linux.filelist index e62655a07..039b3e4b4 100644 --- a/manifest/armv7l/u/util_linux.filelist +++ b/manifest/armv7l/u/util_linux.filelist @@ -1,4 +1,4 @@ -# Total size: 29089377 +# Total size: 25086057 /usr/local/bin/bits /usr/local/bin/cal /usr/local/bin/chfn @@ -14,7 +14,6 @@ /usr/local/bin/dmesg /usr/local/bin/eject /usr/local/bin/enosys -/usr/local/bin/exch /usr/local/bin/fadvise /usr/local/bin/fallocate /usr/local/bin/fincore @@ -32,6 +31,7 @@ /usr/local/bin/last /usr/local/bin/lastb /usr/local/bin/lastlog2 +/usr/local/bin/line /usr/local/bin/linux32 /usr/local/bin/linux64 /usr/local/bin/logger @@ -53,7 +53,9 @@ /usr/local/bin/mount /usr/local/bin/mountpoint /usr/local/bin/namei +/usr/local/bin/newgrp /usr/local/bin/nsenter +/usr/local/bin/pg /usr/local/bin/pipesz /usr/local/bin/prlimit /usr/local/bin/rename @@ -77,10 +79,12 @@ /usr/local/bin/utmpdump /usr/local/bin/uuidgen /usr/local/bin/uuidparse -/usr/local/bin/waitpid +/usr/local/bin/vigr +/usr/local/bin/vipw /usr/local/bin/wall /usr/local/bin/wdctl /usr/local/bin/whereis +/usr/local/bin/write /usr/local/include/blkid/blkid.h /usr/local/include/libfdisk/libfdisk.h /usr/local/include/liblastlog2/lastlog2.h @@ -88,32 +92,23 @@ /usr/local/include/libsmartcols/libsmartcols.h /usr/local/include/uuid/uuid.h /usr/local/lib/libblkid.a -/usr/local/lib/libblkid.la /usr/local/lib/libblkid.so /usr/local/lib/libblkid.so.1 /usr/local/lib/libblkid.so.1.1.0 /usr/local/lib/libfdisk.a -/usr/local/lib/libfdisk.la /usr/local/lib/libfdisk.so /usr/local/lib/libfdisk.so.1 /usr/local/lib/libfdisk.so.1.1.0 -/usr/local/lib/liblastlog2.a -/usr/local/lib/liblastlog2.la /usr/local/lib/liblastlog2.so /usr/local/lib/liblastlog2.so.2 /usr/local/lib/liblastlog2.so.2.0.0 -/usr/local/lib/libmount.a -/usr/local/lib/libmount.la /usr/local/lib/libmount.so /usr/local/lib/libmount.so.1 /usr/local/lib/libmount.so.1.1.0 /usr/local/lib/libsmartcols.a -/usr/local/lib/libsmartcols.la /usr/local/lib/libsmartcols.so /usr/local/lib/libsmartcols.so.1 /usr/local/lib/libsmartcols.so.1.1.0 -/usr/local/lib/libuuid.a -/usr/local/lib/libuuid.la /usr/local/lib/libuuid.so /usr/local/lib/libuuid.so.1 /usr/local/lib/libuuid.so.1.3.0 @@ -124,12 +119,8 @@ /usr/local/lib/pkgconfig/smartcols.pc /usr/local/lib/pkgconfig/uuid.pc /usr/local/lib/python3.13/site-packages/libmount/__init__.py -/usr/local/lib/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.opt-1.pyc -/usr/local/lib/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.opt-2.pyc /usr/local/lib/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.pyc -/usr/local/lib/python3.13/site-packages/libmount/pylibmount.la -/usr/local/lib/python3.13/site-packages/libmount/pylibmount.so -/usr/local/lib/security/pam_lastlog2.la +/usr/local/lib/python3.13/site-packages/libmount/pylibmount.cpython-313-arm-linux-gnueabihf.so /usr/local/lib/security/pam_lastlog2.so /usr/local/sbin/addpart /usr/local/sbin/agetty @@ -160,7 +151,6 @@ /usr/local/sbin/nologin /usr/local/sbin/partx /usr/local/sbin/pivot_root -/usr/local/sbin/raw /usr/local/sbin/readprofile /usr/local/sbin/resizepart /usr/local/sbin/rfkill @@ -172,10 +162,11 @@ /usr/local/sbin/swapoff /usr/local/sbin/swapon /usr/local/sbin/switch_root -/usr/local/sbin/uuidd +/usr/local/sbin/tunelp /usr/local/sbin/wipefs /usr/local/sbin/zramctl /usr/local/share/bash-completion/completions/addpart +/usr/local/share/bash-completion/completions/bits /usr/local/share/bash-completion/completions/blkdiscard /usr/local/share/bash-completion/completions/blkid /usr/local/share/bash-completion/completions/blkzone @@ -185,18 +176,19 @@ /usr/local/share/bash-completion/completions/chcpu /usr/local/share/bash-completion/completions/chfn /usr/local/share/bash-completion/completions/chmem +/usr/local/share/bash-completion/completions/choom /usr/local/share/bash-completion/completions/chrt /usr/local/share/bash-completion/completions/chsh /usr/local/share/bash-completion/completions/col /usr/local/share/bash-completion/completions/colcrt /usr/local/share/bash-completion/completions/colrm /usr/local/share/bash-completion/completions/column +/usr/local/share/bash-completion/completions/coresched /usr/local/share/bash-completion/completions/ctrlaltdel /usr/local/share/bash-completion/completions/delpart /usr/local/share/bash-completion/completions/dmesg /usr/local/share/bash-completion/completions/eject /usr/local/share/bash-completion/completions/enosys -/usr/local/share/bash-completion/completions/exch /usr/local/share/bash-completion/completions/fadvise /usr/local/share/bash-completion/completions/fallocate /usr/local/share/bash-completion/completions/fdisk @@ -246,12 +238,13 @@ /usr/local/share/bash-completion/completions/mount /usr/local/share/bash-completion/completions/mountpoint /usr/local/share/bash-completion/completions/namei +/usr/local/share/bash-completion/completions/newgrp /usr/local/share/bash-completion/completions/nsenter /usr/local/share/bash-completion/completions/partx +/usr/local/share/bash-completion/completions/pg /usr/local/share/bash-completion/completions/pipesz /usr/local/share/bash-completion/completions/pivot_root /usr/local/share/bash-completion/completions/prlimit -/usr/local/share/bash-completion/completions/raw /usr/local/share/bash-completion/completions/readprofile /usr/local/share/bash-completion/completions/rename /usr/local/share/bash-completion/completions/renice @@ -274,6 +267,7 @@ /usr/local/share/bash-completion/completions/swapoff /usr/local/share/bash-completion/completions/swapon /usr/local/share/bash-completion/completions/taskset +/usr/local/share/bash-completion/completions/tunelp /usr/local/share/bash-completion/completions/uclampset /usr/local/share/bash-completion/completions/ul /usr/local/share/bash-completion/completions/umount @@ -282,11 +276,11 @@ /usr/local/share/bash-completion/completions/uuidd /usr/local/share/bash-completion/completions/uuidgen /usr/local/share/bash-completion/completions/uuidparse -/usr/local/share/bash-completion/completions/waitpid /usr/local/share/bash-completion/completions/wall /usr/local/share/bash-completion/completions/wdctl /usr/local/share/bash-completion/completions/whereis /usr/local/share/bash-completion/completions/wipefs +/usr/local/share/bash-completion/completions/write /usr/local/share/bash-completion/completions/zramctl /usr/local/share/doc/util-linux/getopt-example.bash /usr/local/share/doc/util-linux/getopt-example.tcsh @@ -336,7 +330,6 @@ /usr/local/share/man/man1/dmesg.1.zst /usr/local/share/man/man1/eject.1.zst /usr/local/share/man/man1/enosys.1.zst -/usr/local/share/man/man1/exch.1.zst /usr/local/share/man/man1/fadvise.1.zst /usr/local/share/man/man1/fallocate.1.zst /usr/local/share/man/man1/fincore.1.zst @@ -351,6 +344,7 @@ /usr/local/share/man/man1/irqtop.1.zst /usr/local/share/man/man1/last.1.zst /usr/local/share/man/man1/lastb.1.zst +/usr/local/share/man/man1/line.1.zst /usr/local/share/man/man1/logger.1.zst /usr/local/share/man/man1/login.1.zst /usr/local/share/man/man1/look.1.zst @@ -366,7 +360,9 @@ /usr/local/share/man/man1/more.1.zst /usr/local/share/man/man1/mountpoint.1.zst /usr/local/share/man/man1/namei.1.zst +/usr/local/share/man/man1/newgrp.1.zst /usr/local/share/man/man1/nsenter.1.zst +/usr/local/share/man/man1/pg.1.zst /usr/local/share/man/man1/pipesz.1.zst /usr/local/share/man/man1/prlimit.1.zst /usr/local/share/man/man1/rename.1.zst @@ -388,9 +384,9 @@ /usr/local/share/man/man1/utmpdump.1.zst /usr/local/share/man/man1/uuidgen.1.zst /usr/local/share/man/man1/uuidparse.1.zst -/usr/local/share/man/man1/waitpid.1.zst /usr/local/share/man/man1/wall.1.zst /usr/local/share/man/man1/whereis.1.zst +/usr/local/share/man/man1/write.1.zst /usr/local/share/man/man3/lastlog2.3.zst /usr/local/share/man/man3/libblkid.3.zst /usr/local/share/man/man3/ll2_import_lastlog.3.zst @@ -448,15 +444,12 @@ /usr/local/share/man/man8/lsns.8.zst /usr/local/share/man/man8/mkfs.8.zst /usr/local/share/man/man8/mkfs.bfs.8.zst -/usr/local/share/man/man8/mkfs.cramfs.8.zst -/usr/local/share/man/man8/mkfs.minix.8.zst /usr/local/share/man/man8/mkswap.8.zst /usr/local/share/man/man8/mount.8.zst /usr/local/share/man/man8/nologin.8.zst /usr/local/share/man/man8/pam_lastlog2.8.zst /usr/local/share/man/man8/partx.8.zst /usr/local/share/man/man8/pivot_root.8.zst -/usr/local/share/man/man8/raw.8.zst /usr/local/share/man/man8/readprofile.8.zst /usr/local/share/man/man8/resizepart.8.zst /usr/local/share/man/man8/rfkill.8.zst @@ -468,9 +461,12 @@ /usr/local/share/man/man8/swapoff.8.zst /usr/local/share/man/man8/swapon.8.zst /usr/local/share/man/man8/switch_root.8.zst +/usr/local/share/man/man8/tunelp.8.zst /usr/local/share/man/man8/umount.8.zst /usr/local/share/man/man8/uname26.8.zst /usr/local/share/man/man8/uuidd.8.zst +/usr/local/share/man/man8/vigr.8.zst +/usr/local/share/man/man8/vipw.8.zst /usr/local/share/man/man8/wdctl.8.zst /usr/local/share/man/man8/wipefs.8.zst /usr/local/share/man/man8/zramctl.8.zst diff --git a/manifest/i686/p/pcre2.filelist b/manifest/i686/p/pcre2.filelist index d957cdff3..b8b2c7d36 100644 --- a/manifest/i686/p/pcre2.filelist +++ b/manifest/i686/p/pcre2.filelist @@ -1,4 +1,4 @@ -# Total size: 11632655 +# Total size: 11632299 /usr/local/bin/pcre2-config /usr/local/bin/pcre2grep /usr/local/include/pcre2.h diff --git a/manifest/i686/u/util_linux.filelist b/manifest/i686/u/util_linux.filelist index 2d663b580..7249f6b2d 100644 --- a/manifest/i686/u/util_linux.filelist +++ b/manifest/i686/u/util_linux.filelist @@ -1,4 +1,4 @@ -# Total size: 30095904 +# Total size: 26833815 /usr/local/bin/bits /usr/local/bin/cal /usr/local/bin/chfn @@ -14,7 +14,6 @@ /usr/local/bin/dmesg /usr/local/bin/eject /usr/local/bin/enosys -/usr/local/bin/exch /usr/local/bin/fadvise /usr/local/bin/fallocate /usr/local/bin/fincore @@ -33,6 +32,7 @@ /usr/local/bin/last /usr/local/bin/lastb /usr/local/bin/lastlog2 +/usr/local/bin/line /usr/local/bin/linux32 /usr/local/bin/linux64 /usr/local/bin/logger @@ -53,7 +53,9 @@ /usr/local/bin/mount /usr/local/bin/mountpoint /usr/local/bin/namei +/usr/local/bin/newgrp /usr/local/bin/nsenter +/usr/local/bin/pg /usr/local/bin/pipesz /usr/local/bin/prlimit /usr/local/bin/rename @@ -77,9 +79,12 @@ /usr/local/bin/utmpdump /usr/local/bin/uuidgen /usr/local/bin/uuidparse +/usr/local/bin/vigr +/usr/local/bin/vipw /usr/local/bin/wall /usr/local/bin/wdctl /usr/local/bin/whereis +/usr/local/bin/write /usr/local/include/blkid/blkid.h /usr/local/include/libfdisk/libfdisk.h /usr/local/include/liblastlog2/lastlog2.h @@ -87,32 +92,23 @@ /usr/local/include/libsmartcols/libsmartcols.h /usr/local/include/uuid/uuid.h /usr/local/lib/libblkid.a -/usr/local/lib/libblkid.la /usr/local/lib/libblkid.so /usr/local/lib/libblkid.so.1 /usr/local/lib/libblkid.so.1.1.0 /usr/local/lib/libfdisk.a -/usr/local/lib/libfdisk.la /usr/local/lib/libfdisk.so /usr/local/lib/libfdisk.so.1 /usr/local/lib/libfdisk.so.1.1.0 -/usr/local/lib/liblastlog2.a -/usr/local/lib/liblastlog2.la /usr/local/lib/liblastlog2.so /usr/local/lib/liblastlog2.so.2 /usr/local/lib/liblastlog2.so.2.0.0 -/usr/local/lib/libmount.a -/usr/local/lib/libmount.la /usr/local/lib/libmount.so /usr/local/lib/libmount.so.1 /usr/local/lib/libmount.so.1.1.0 /usr/local/lib/libsmartcols.a -/usr/local/lib/libsmartcols.la /usr/local/lib/libsmartcols.so /usr/local/lib/libsmartcols.so.1 /usr/local/lib/libsmartcols.so.1.1.0 -/usr/local/lib/libuuid.a -/usr/local/lib/libuuid.la /usr/local/lib/libuuid.so /usr/local/lib/libuuid.so.1 /usr/local/lib/libuuid.so.1.3.0 @@ -123,12 +119,8 @@ /usr/local/lib/pkgconfig/smartcols.pc /usr/local/lib/pkgconfig/uuid.pc /usr/local/lib/python3.13/site-packages/libmount/__init__.py -/usr/local/lib/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.opt-1.pyc -/usr/local/lib/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.opt-2.pyc /usr/local/lib/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.pyc -/usr/local/lib/python3.13/site-packages/libmount/pylibmount.la -/usr/local/lib/python3.13/site-packages/libmount/pylibmount.so -/usr/local/lib/security/pam_lastlog2.la +/usr/local/lib/python3.13/site-packages/libmount/pylibmount.cpython-313-i386-linux-gnu.so /usr/local/lib/security/pam_lastlog2.so /usr/local/sbin/addpart /usr/local/sbin/agetty @@ -157,7 +149,6 @@ /usr/local/sbin/nologin /usr/local/sbin/partx /usr/local/sbin/pivot_root -/usr/local/sbin/raw /usr/local/sbin/readprofile /usr/local/sbin/resizepart /usr/local/sbin/rfkill @@ -169,10 +160,11 @@ /usr/local/sbin/swapoff /usr/local/sbin/swapon /usr/local/sbin/switch_root -/usr/local/sbin/uuidd +/usr/local/sbin/tunelp /usr/local/sbin/wipefs /usr/local/sbin/zramctl /usr/local/share/bash-completion/completions/addpart +/usr/local/share/bash-completion/completions/bits /usr/local/share/bash-completion/completions/blkdiscard /usr/local/share/bash-completion/completions/blkid /usr/local/share/bash-completion/completions/blockdev @@ -181,18 +173,19 @@ /usr/local/share/bash-completion/completions/chcpu /usr/local/share/bash-completion/completions/chfn /usr/local/share/bash-completion/completions/chmem +/usr/local/share/bash-completion/completions/choom /usr/local/share/bash-completion/completions/chrt /usr/local/share/bash-completion/completions/chsh /usr/local/share/bash-completion/completions/col /usr/local/share/bash-completion/completions/colcrt /usr/local/share/bash-completion/completions/colrm /usr/local/share/bash-completion/completions/column +/usr/local/share/bash-completion/completions/coresched /usr/local/share/bash-completion/completions/ctrlaltdel /usr/local/share/bash-completion/completions/delpart /usr/local/share/bash-completion/completions/dmesg /usr/local/share/bash-completion/completions/eject /usr/local/share/bash-completion/completions/enosys -/usr/local/share/bash-completion/completions/exch /usr/local/share/bash-completion/completions/fadvise /usr/local/share/bash-completion/completions/fallocate /usr/local/share/bash-completion/completions/fdisk @@ -242,12 +235,13 @@ /usr/local/share/bash-completion/completions/mount /usr/local/share/bash-completion/completions/mountpoint /usr/local/share/bash-completion/completions/namei +/usr/local/share/bash-completion/completions/newgrp /usr/local/share/bash-completion/completions/nsenter /usr/local/share/bash-completion/completions/partx +/usr/local/share/bash-completion/completions/pg /usr/local/share/bash-completion/completions/pipesz /usr/local/share/bash-completion/completions/pivot_root /usr/local/share/bash-completion/completions/prlimit -/usr/local/share/bash-completion/completions/raw /usr/local/share/bash-completion/completions/readprofile /usr/local/share/bash-completion/completions/rename /usr/local/share/bash-completion/completions/renice @@ -270,6 +264,7 @@ /usr/local/share/bash-completion/completions/swapoff /usr/local/share/bash-completion/completions/swapon /usr/local/share/bash-completion/completions/taskset +/usr/local/share/bash-completion/completions/tunelp /usr/local/share/bash-completion/completions/uclampset /usr/local/share/bash-completion/completions/ul /usr/local/share/bash-completion/completions/umount @@ -282,6 +277,7 @@ /usr/local/share/bash-completion/completions/wdctl /usr/local/share/bash-completion/completions/whereis /usr/local/share/bash-completion/completions/wipefs +/usr/local/share/bash-completion/completions/write /usr/local/share/bash-completion/completions/zramctl /usr/local/share/doc/util-linux/getopt-example.bash /usr/local/share/doc/util-linux/getopt-example.tcsh @@ -331,7 +327,6 @@ /usr/local/share/man/man1/dmesg.1.zst /usr/local/share/man/man1/eject.1.zst /usr/local/share/man/man1/enosys.1.zst -/usr/local/share/man/man1/exch.1.zst /usr/local/share/man/man1/fadvise.1.zst /usr/local/share/man/man1/fallocate.1.zst /usr/local/share/man/man1/fincore.1.zst @@ -346,6 +341,7 @@ /usr/local/share/man/man1/irqtop.1.zst /usr/local/share/man/man1/last.1.zst /usr/local/share/man/man1/lastb.1.zst +/usr/local/share/man/man1/line.1.zst /usr/local/share/man/man1/logger.1.zst /usr/local/share/man/man1/login.1.zst /usr/local/share/man/man1/look.1.zst @@ -360,7 +356,9 @@ /usr/local/share/man/man1/more.1.zst /usr/local/share/man/man1/mountpoint.1.zst /usr/local/share/man/man1/namei.1.zst +/usr/local/share/man/man1/newgrp.1.zst /usr/local/share/man/man1/nsenter.1.zst +/usr/local/share/man/man1/pg.1.zst /usr/local/share/man/man1/pipesz.1.zst /usr/local/share/man/man1/prlimit.1.zst /usr/local/share/man/man1/rename.1.zst @@ -384,6 +382,7 @@ /usr/local/share/man/man1/uuidparse.1.zst /usr/local/share/man/man1/wall.1.zst /usr/local/share/man/man1/whereis.1.zst +/usr/local/share/man/man1/write.1.zst /usr/local/share/man/man3/lastlog2.3.zst /usr/local/share/man/man3/libblkid.3.zst /usr/local/share/man/man3/ll2_import_lastlog.3.zst @@ -440,15 +439,12 @@ /usr/local/share/man/man8/lsns.8.zst /usr/local/share/man/man8/mkfs.8.zst /usr/local/share/man/man8/mkfs.bfs.8.zst -/usr/local/share/man/man8/mkfs.cramfs.8.zst -/usr/local/share/man/man8/mkfs.minix.8.zst /usr/local/share/man/man8/mkswap.8.zst /usr/local/share/man/man8/mount.8.zst /usr/local/share/man/man8/nologin.8.zst /usr/local/share/man/man8/pam_lastlog2.8.zst /usr/local/share/man/man8/partx.8.zst /usr/local/share/man/man8/pivot_root.8.zst -/usr/local/share/man/man8/raw.8.zst /usr/local/share/man/man8/readprofile.8.zst /usr/local/share/man/man8/resizepart.8.zst /usr/local/share/man/man8/rfkill.8.zst @@ -460,9 +456,12 @@ /usr/local/share/man/man8/swapoff.8.zst /usr/local/share/man/man8/swapon.8.zst /usr/local/share/man/man8/switch_root.8.zst +/usr/local/share/man/man8/tunelp.8.zst /usr/local/share/man/man8/umount.8.zst /usr/local/share/man/man8/uname26.8.zst /usr/local/share/man/man8/uuidd.8.zst +/usr/local/share/man/man8/vigr.8.zst +/usr/local/share/man/man8/vipw.8.zst /usr/local/share/man/man8/wdctl.8.zst /usr/local/share/man/man8/wipefs.8.zst /usr/local/share/man/man8/zramctl.8.zst diff --git a/manifest/x86_64/p/pcre2.filelist b/manifest/x86_64/p/pcre2.filelist index 0d8d4c1ce..ac2de54b1 100644 --- a/manifest/x86_64/p/pcre2.filelist +++ b/manifest/x86_64/p/pcre2.filelist @@ -1,4 +1,4 @@ -# Total size: 11715267 +# Total size: 11853473 /usr/local/bin/pcre2-config /usr/local/bin/pcre2grep /usr/local/include/pcre2.h diff --git a/manifest/x86_64/u/util_linux.filelist b/manifest/x86_64/u/util_linux.filelist index efe4be760..8d7c969d1 100644 --- a/manifest/x86_64/u/util_linux.filelist +++ b/manifest/x86_64/u/util_linux.filelist @@ -1,4 +1,4 @@ -# Total size: 31234891 +# Total size: 27651998 /usr/local/bin/bits /usr/local/bin/cal /usr/local/bin/chfn @@ -14,7 +14,6 @@ /usr/local/bin/dmesg /usr/local/bin/eject /usr/local/bin/enosys -/usr/local/bin/exch /usr/local/bin/fadvise /usr/local/bin/fallocate /usr/local/bin/fincore @@ -33,6 +32,7 @@ /usr/local/bin/last /usr/local/bin/lastb /usr/local/bin/lastlog2 +/usr/local/bin/line /usr/local/bin/linux32 /usr/local/bin/linux64 /usr/local/bin/logger @@ -54,7 +54,9 @@ /usr/local/bin/mount /usr/local/bin/mountpoint /usr/local/bin/namei +/usr/local/bin/newgrp /usr/local/bin/nsenter +/usr/local/bin/pg /usr/local/bin/pipesz /usr/local/bin/prlimit /usr/local/bin/rename @@ -78,10 +80,12 @@ /usr/local/bin/utmpdump /usr/local/bin/uuidgen /usr/local/bin/uuidparse -/usr/local/bin/waitpid +/usr/local/bin/vigr +/usr/local/bin/vipw /usr/local/bin/wall /usr/local/bin/wdctl /usr/local/bin/whereis +/usr/local/bin/write /usr/local/bin/x86_64 /usr/local/include/blkid/blkid.h /usr/local/include/libfdisk/libfdisk.h @@ -90,32 +94,23 @@ /usr/local/include/libsmartcols/libsmartcols.h /usr/local/include/uuid/uuid.h /usr/local/lib64/libblkid.a -/usr/local/lib64/libblkid.la /usr/local/lib64/libblkid.so /usr/local/lib64/libblkid.so.1 /usr/local/lib64/libblkid.so.1.1.0 /usr/local/lib64/libfdisk.a -/usr/local/lib64/libfdisk.la /usr/local/lib64/libfdisk.so /usr/local/lib64/libfdisk.so.1 /usr/local/lib64/libfdisk.so.1.1.0 -/usr/local/lib64/liblastlog2.a -/usr/local/lib64/liblastlog2.la /usr/local/lib64/liblastlog2.so /usr/local/lib64/liblastlog2.so.2 /usr/local/lib64/liblastlog2.so.2.0.0 -/usr/local/lib64/libmount.a -/usr/local/lib64/libmount.la /usr/local/lib64/libmount.so /usr/local/lib64/libmount.so.1 /usr/local/lib64/libmount.so.1.1.0 /usr/local/lib64/libsmartcols.a -/usr/local/lib64/libsmartcols.la /usr/local/lib64/libsmartcols.so /usr/local/lib64/libsmartcols.so.1 /usr/local/lib64/libsmartcols.so.1.1.0 -/usr/local/lib64/libuuid.a -/usr/local/lib64/libuuid.la /usr/local/lib64/libuuid.so /usr/local/lib64/libuuid.so.1 /usr/local/lib64/libuuid.so.1.3.0 @@ -126,12 +121,8 @@ /usr/local/lib64/pkgconfig/smartcols.pc /usr/local/lib64/pkgconfig/uuid.pc /usr/local/lib64/python3.13/site-packages/libmount/__init__.py -/usr/local/lib64/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.opt-1.pyc -/usr/local/lib64/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.opt-2.pyc /usr/local/lib64/python3.13/site-packages/libmount/__pycache__/__init__.cpython-313.pyc -/usr/local/lib64/python3.13/site-packages/libmount/pylibmount.la -/usr/local/lib64/python3.13/site-packages/libmount/pylibmount.so -/usr/local/lib64/security/pam_lastlog2.la +/usr/local/lib64/python3.13/site-packages/libmount/pylibmount.cpython-313-x86_64-linux-gnu.so /usr/local/lib64/security/pam_lastlog2.so /usr/local/sbin/addpart /usr/local/sbin/agetty @@ -162,7 +153,6 @@ /usr/local/sbin/nologin /usr/local/sbin/partx /usr/local/sbin/pivot_root -/usr/local/sbin/raw /usr/local/sbin/readprofile /usr/local/sbin/resizepart /usr/local/sbin/rfkill @@ -174,10 +164,11 @@ /usr/local/sbin/swapoff /usr/local/sbin/swapon /usr/local/sbin/switch_root -/usr/local/sbin/uuidd +/usr/local/sbin/tunelp /usr/local/sbin/wipefs /usr/local/sbin/zramctl /usr/local/share/bash-completion/completions/addpart +/usr/local/share/bash-completion/completions/bits /usr/local/share/bash-completion/completions/blkdiscard /usr/local/share/bash-completion/completions/blkid /usr/local/share/bash-completion/completions/blkzone @@ -187,18 +178,19 @@ /usr/local/share/bash-completion/completions/chcpu /usr/local/share/bash-completion/completions/chfn /usr/local/share/bash-completion/completions/chmem +/usr/local/share/bash-completion/completions/choom /usr/local/share/bash-completion/completions/chrt /usr/local/share/bash-completion/completions/chsh /usr/local/share/bash-completion/completions/col /usr/local/share/bash-completion/completions/colcrt /usr/local/share/bash-completion/completions/colrm /usr/local/share/bash-completion/completions/column +/usr/local/share/bash-completion/completions/coresched /usr/local/share/bash-completion/completions/ctrlaltdel /usr/local/share/bash-completion/completions/delpart /usr/local/share/bash-completion/completions/dmesg /usr/local/share/bash-completion/completions/eject /usr/local/share/bash-completion/completions/enosys -/usr/local/share/bash-completion/completions/exch /usr/local/share/bash-completion/completions/fadvise /usr/local/share/bash-completion/completions/fallocate /usr/local/share/bash-completion/completions/fdisk @@ -248,12 +240,13 @@ /usr/local/share/bash-completion/completions/mount /usr/local/share/bash-completion/completions/mountpoint /usr/local/share/bash-completion/completions/namei +/usr/local/share/bash-completion/completions/newgrp /usr/local/share/bash-completion/completions/nsenter /usr/local/share/bash-completion/completions/partx +/usr/local/share/bash-completion/completions/pg /usr/local/share/bash-completion/completions/pipesz /usr/local/share/bash-completion/completions/pivot_root /usr/local/share/bash-completion/completions/prlimit -/usr/local/share/bash-completion/completions/raw /usr/local/share/bash-completion/completions/readprofile /usr/local/share/bash-completion/completions/rename /usr/local/share/bash-completion/completions/renice @@ -276,6 +269,7 @@ /usr/local/share/bash-completion/completions/swapoff /usr/local/share/bash-completion/completions/swapon /usr/local/share/bash-completion/completions/taskset +/usr/local/share/bash-completion/completions/tunelp /usr/local/share/bash-completion/completions/uclampset /usr/local/share/bash-completion/completions/ul /usr/local/share/bash-completion/completions/umount @@ -284,11 +278,11 @@ /usr/local/share/bash-completion/completions/uuidd /usr/local/share/bash-completion/completions/uuidgen /usr/local/share/bash-completion/completions/uuidparse -/usr/local/share/bash-completion/completions/waitpid /usr/local/share/bash-completion/completions/wall /usr/local/share/bash-completion/completions/wdctl /usr/local/share/bash-completion/completions/whereis /usr/local/share/bash-completion/completions/wipefs +/usr/local/share/bash-completion/completions/write /usr/local/share/bash-completion/completions/zramctl /usr/local/share/doc/util-linux/getopt-example.bash /usr/local/share/doc/util-linux/getopt-example.tcsh @@ -338,7 +332,6 @@ /usr/local/share/man/man1/dmesg.1.zst /usr/local/share/man/man1/eject.1.zst /usr/local/share/man/man1/enosys.1.zst -/usr/local/share/man/man1/exch.1.zst /usr/local/share/man/man1/fadvise.1.zst /usr/local/share/man/man1/fallocate.1.zst /usr/local/share/man/man1/fincore.1.zst @@ -353,6 +346,7 @@ /usr/local/share/man/man1/irqtop.1.zst /usr/local/share/man/man1/last.1.zst /usr/local/share/man/man1/lastb.1.zst +/usr/local/share/man/man1/line.1.zst /usr/local/share/man/man1/logger.1.zst /usr/local/share/man/man1/login.1.zst /usr/local/share/man/man1/look.1.zst @@ -368,7 +362,9 @@ /usr/local/share/man/man1/more.1.zst /usr/local/share/man/man1/mountpoint.1.zst /usr/local/share/man/man1/namei.1.zst +/usr/local/share/man/man1/newgrp.1.zst /usr/local/share/man/man1/nsenter.1.zst +/usr/local/share/man/man1/pg.1.zst /usr/local/share/man/man1/pipesz.1.zst /usr/local/share/man/man1/prlimit.1.zst /usr/local/share/man/man1/rename.1.zst @@ -390,9 +386,9 @@ /usr/local/share/man/man1/utmpdump.1.zst /usr/local/share/man/man1/uuidgen.1.zst /usr/local/share/man/man1/uuidparse.1.zst -/usr/local/share/man/man1/waitpid.1.zst /usr/local/share/man/man1/wall.1.zst /usr/local/share/man/man1/whereis.1.zst +/usr/local/share/man/man1/write.1.zst /usr/local/share/man/man3/lastlog2.3.zst /usr/local/share/man/man3/libblkid.3.zst /usr/local/share/man/man3/ll2_import_lastlog.3.zst @@ -451,15 +447,12 @@ /usr/local/share/man/man8/lsns.8.zst /usr/local/share/man/man8/mkfs.8.zst /usr/local/share/man/man8/mkfs.bfs.8.zst -/usr/local/share/man/man8/mkfs.cramfs.8.zst -/usr/local/share/man/man8/mkfs.minix.8.zst /usr/local/share/man/man8/mkswap.8.zst /usr/local/share/man/man8/mount.8.zst /usr/local/share/man/man8/nologin.8.zst /usr/local/share/man/man8/pam_lastlog2.8.zst /usr/local/share/man/man8/partx.8.zst /usr/local/share/man/man8/pivot_root.8.zst -/usr/local/share/man/man8/raw.8.zst /usr/local/share/man/man8/readprofile.8.zst /usr/local/share/man/man8/resizepart.8.zst /usr/local/share/man/man8/rfkill.8.zst @@ -471,9 +464,12 @@ /usr/local/share/man/man8/swapoff.8.zst /usr/local/share/man/man8/swapon.8.zst /usr/local/share/man/man8/switch_root.8.zst +/usr/local/share/man/man8/tunelp.8.zst /usr/local/share/man/man8/umount.8.zst /usr/local/share/man/man8/uname26.8.zst /usr/local/share/man/man8/uuidd.8.zst +/usr/local/share/man/man8/vigr.8.zst +/usr/local/share/man/man8/vipw.8.zst /usr/local/share/man/man8/wdctl.8.zst /usr/local/share/man/man8/wipefs.8.zst /usr/local/share/man/man8/x86_64.8.zst diff --git a/packages/pcre2.rb b/packages/pcre2.rb index 19195eb67..3572e9eee 100644 --- a/packages/pcre2.rb +++ b/packages/pcre2.rb @@ -3,18 +3,18 @@ require 'buildsystems/cmake' class Pcre2 < CMake description 'The PCRE2 package contains a new generation of the Perl Compatible Regular Expression libraries.' homepage 'http://pcre.org/' - version '10.47' + version '10.47-1' license 'BSD-3' compatibility 'all' source_url 'https://github.com/PCRE2Project/pcre2.git' - git_hashtag "pcre2-#{version}" + git_hashtag "pcre2-#{version.split('-').first}" binary_compression 'tar.zst' binary_sha256({ - aarch64: '7ea96601b02228bed691562eaeee0cceb16afc51f9e936dd70d40cbfd5de10f7', - armv7l: '7ea96601b02228bed691562eaeee0cceb16afc51f9e936dd70d40cbfd5de10f7', - i686: 'b9da911c67074d3e4d39dc804ff5f8543027af30edc8dc312807bef601704171', - x86_64: '864929a9e9e90827d72dc6223b1832c71a5a09c98cfd86731c5266c1fe05a3d8' + aarch64: '50bce7a8074feea90a002497dc5fb37f309becbc545fdc14ba18232f949c6c14', + armv7l: '50bce7a8074feea90a002497dc5fb37f309becbc545fdc14ba18232f949c6c14', + i686: 'e01a8475d9598dd01b11d06f7cd274ab419a98e107bee2ae56382d8cd933b43a', + x86_64: '0684ca6b8a488696d594cc0874721fae0d8314eb59b0956709ce2e9b1233cab9' }) depends_on 'bzip2' # R diff --git a/packages/util_linux.rb b/packages/util_linux.rb index b9cba2f87..2469a8070 100644 --- a/packages/util_linux.rb +++ b/packages/util_linux.rb @@ -1,23 +1,24 @@ -require 'buildsystems/autotools' +require 'buildsystems/meson' -class Util_linux < Autotools +class Util_linux < Meson description 'essential linux tools' homepage 'https://www.kernel.org/pub/linux/utils/util-linux/' - version "2.41.1-#{CREW_PY_VER}" + version "2.41.2-9179172-#{CREW_PY_VER}" license 'GPL-2, LGPL-2.1, BSD-4, MIT and public-domain' compatibility 'all' source_url 'https://github.com/util-linux/util-linux.git' - git_hashtag "v#{version.split('-').first}" + # Build from stable/v2.4.1 branch. + git_hashtag '917917253e60b0ba485cf6a27a2f993aa43e1eea' + # git_hashtag "v#{version.split('-').first}" binary_compression 'tar.zst' binary_sha256({ - aarch64: '77a7d99d721c3366567224bfc5efc758040505bd52d71f3d487ae56e53da7c8d', - armv7l: '77a7d99d721c3366567224bfc5efc758040505bd52d71f3d487ae56e53da7c8d', - i686: 'ef3547c60f160f7bfb1e3a8acce8f21838bc33dd371215bf71efc5f5978d5d4c', - x86_64: '7d831a53ebdc3a9c114293584c0a900a626aeb7f83aaefe1379e3bb550ebc3bc' + aarch64: '091641baf6d3e93ceeb3f06468af895e18eadf4d68167dae863d7ec9d1fe637f', + armv7l: '091641baf6d3e93ceeb3f06468af895e18eadf4d68167dae863d7ec9d1fe637f', + i686: '5e9aeec5e4c6e7cb7dd3b1b3793b9ceb437505d7de8b3ce927d5f04ac6efb9e9', + x86_64: 'd0a8545e106f3caa6497f9ea11e429a565c05f504bf8abb926b47d6de1ce52a4' }) - depends_on 'bzip2' # R depends_on 'eudev' if ARCH == 'x86_64' # (for libudev.h) depends_on 'filecmd' # R depends_on 'gcc_lib' # R @@ -26,26 +27,24 @@ class Util_linux < Autotools depends_on 'libeconf' # R depends_on 'libxcrypt' # R depends_on 'linux_pam' # R - depends_on 'lzlib' # R depends_on 'ncurses' # R depends_on 'pcre2' => :build + depends_on 'python3' # R depends_on 'readline' # R depends_on 'ruby_asciidoctor' => :build depends_on 'sqlite' # R - depends_on 'xzutils' # R depends_on 'zlib' # R - depends_on 'zstd' # R conflicts_ok - year2038 = '--disable-year2038' - i686_disabled_builds = '--disable-blkzone --disable-lsfd' - autotools_configure_options "#{year2038 unless ARCH == 'x86_64'} \ - --disable-kill \ - #{i686_disabled_builds if ARCH == 'i686'} \ - --disable-makeinstall-chown \ - --disable-makeinstall-setuid \ - --disable-makeinstall-tty-setgid \ - --without-systemd \ - --without-udev" + # Needs to be built with CREW_KERNEL_VERSION=5.10 for the build to + # succeed on x86_64 and armv7l. + year2038 = '-Dallow-32bit-time=true' + i686_disabled_builds = '-Dbuild-blkzone=disabled -Dbuild-lsfd=disabled' + meson_options "-Dbuild-kill=disabled \ + -Dbuild-uuidd=disabled \ + -Dprogram-tests=false \ + -Dsystemd=disabled \ + #{i686_disabled_builds if ARCH == 'i686'} \ + #{year2038 unless ARCH == 'x86_64'}" end