From 89c0cb34b7313636d8d2051c11c7dc48a1f670e5 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Tue, 22 Oct 2024 16:12:46 -0500 Subject: [PATCH] Moreutils 0.65 => 0.69 (#10654) Co-authored-by: Satadru Pramanik, DO, MPH, MEng --- manifest/armv7l/m/moreutils.filelist | 30 ++++++++++++++-------------- manifest/i686/m/moreutils.filelist | 30 ++++++++++++++-------------- manifest/x86_64/m/moreutils.filelist | 30 ++++++++++++++-------------- packages/moreutils.rb | 24 ++++++++++++---------- 4 files changed, 58 insertions(+), 56 deletions(-) diff --git a/manifest/armv7l/m/moreutils.filelist b/manifest/armv7l/m/moreutils.filelist index 099359901..bd395fe01 100644 --- a/manifest/armv7l/m/moreutils.filelist +++ b/manifest/armv7l/m/moreutils.filelist @@ -13,18 +13,18 @@ /usr/local/bin/vidir /usr/local/bin/vipe /usr/local/bin/zrun -/usr/local/man/man1/chronic.1.gz -/usr/local/man/man1/combine.1.gz -/usr/local/man/man1/errno.1.gz -/usr/local/man/man1/ifdata.1.gz -/usr/local/man/man1/ifne.1.gz -/usr/local/man/man1/isutf8.1.gz -/usr/local/man/man1/lckdo.1.gz -/usr/local/man/man1/mispipe.1.gz -/usr/local/man/man1/parallel.1.gz -/usr/local/man/man1/pee.1.gz -/usr/local/man/man1/sponge.1.gz -/usr/local/man/man1/ts.1.gz -/usr/local/man/man1/vidir.1.gz -/usr/local/man/man1/vipe.1.gz -/usr/local/man/man1/zrun.1.gz +/usr/local/share/man/man1/chronic.1.zst +/usr/local/share/man/man1/combine.1.zst +/usr/local/share/man/man1/errno.1.zst +/usr/local/share/man/man1/ifdata.1.zst +/usr/local/share/man/man1/ifne.1.zst +/usr/local/share/man/man1/isutf8.1.zst +/usr/local/share/man/man1/lckdo.1.zst +/usr/local/share/man/man1/mispipe.1.zst +/usr/local/share/man/man1/parallel.1.zst +/usr/local/share/man/man1/pee.1.zst +/usr/local/share/man/man1/sponge.1.zst +/usr/local/share/man/man1/ts.1.zst +/usr/local/share/man/man1/vidir.1.zst +/usr/local/share/man/man1/vipe.1.zst +/usr/local/share/man/man1/zrun.1.zst diff --git a/manifest/i686/m/moreutils.filelist b/manifest/i686/m/moreutils.filelist index 099359901..bd395fe01 100644 --- a/manifest/i686/m/moreutils.filelist +++ b/manifest/i686/m/moreutils.filelist @@ -13,18 +13,18 @@ /usr/local/bin/vidir /usr/local/bin/vipe /usr/local/bin/zrun -/usr/local/man/man1/chronic.1.gz -/usr/local/man/man1/combine.1.gz -/usr/local/man/man1/errno.1.gz -/usr/local/man/man1/ifdata.1.gz -/usr/local/man/man1/ifne.1.gz -/usr/local/man/man1/isutf8.1.gz -/usr/local/man/man1/lckdo.1.gz -/usr/local/man/man1/mispipe.1.gz -/usr/local/man/man1/parallel.1.gz -/usr/local/man/man1/pee.1.gz -/usr/local/man/man1/sponge.1.gz -/usr/local/man/man1/ts.1.gz -/usr/local/man/man1/vidir.1.gz -/usr/local/man/man1/vipe.1.gz -/usr/local/man/man1/zrun.1.gz +/usr/local/share/man/man1/chronic.1.zst +/usr/local/share/man/man1/combine.1.zst +/usr/local/share/man/man1/errno.1.zst +/usr/local/share/man/man1/ifdata.1.zst +/usr/local/share/man/man1/ifne.1.zst +/usr/local/share/man/man1/isutf8.1.zst +/usr/local/share/man/man1/lckdo.1.zst +/usr/local/share/man/man1/mispipe.1.zst +/usr/local/share/man/man1/parallel.1.zst +/usr/local/share/man/man1/pee.1.zst +/usr/local/share/man/man1/sponge.1.zst +/usr/local/share/man/man1/ts.1.zst +/usr/local/share/man/man1/vidir.1.zst +/usr/local/share/man/man1/vipe.1.zst +/usr/local/share/man/man1/zrun.1.zst diff --git a/manifest/x86_64/m/moreutils.filelist b/manifest/x86_64/m/moreutils.filelist index 099359901..bd395fe01 100644 --- a/manifest/x86_64/m/moreutils.filelist +++ b/manifest/x86_64/m/moreutils.filelist @@ -13,18 +13,18 @@ /usr/local/bin/vidir /usr/local/bin/vipe /usr/local/bin/zrun -/usr/local/man/man1/chronic.1.gz -/usr/local/man/man1/combine.1.gz -/usr/local/man/man1/errno.1.gz -/usr/local/man/man1/ifdata.1.gz -/usr/local/man/man1/ifne.1.gz -/usr/local/man/man1/isutf8.1.gz -/usr/local/man/man1/lckdo.1.gz -/usr/local/man/man1/mispipe.1.gz -/usr/local/man/man1/parallel.1.gz -/usr/local/man/man1/pee.1.gz -/usr/local/man/man1/sponge.1.gz -/usr/local/man/man1/ts.1.gz -/usr/local/man/man1/vidir.1.gz -/usr/local/man/man1/vipe.1.gz -/usr/local/man/man1/zrun.1.gz +/usr/local/share/man/man1/chronic.1.zst +/usr/local/share/man/man1/combine.1.zst +/usr/local/share/man/man1/errno.1.zst +/usr/local/share/man/man1/ifdata.1.zst +/usr/local/share/man/man1/ifne.1.zst +/usr/local/share/man/man1/isutf8.1.zst +/usr/local/share/man/man1/lckdo.1.zst +/usr/local/share/man/man1/mispipe.1.zst +/usr/local/share/man/man1/parallel.1.zst +/usr/local/share/man/man1/pee.1.zst +/usr/local/share/man/man1/sponge.1.zst +/usr/local/share/man/man1/ts.1.zst +/usr/local/share/man/man1/vidir.1.zst +/usr/local/share/man/man1/vipe.1.zst +/usr/local/share/man/man1/zrun.1.zst diff --git a/packages/moreutils.rb b/packages/moreutils.rb index 16a337034..ad216bdf2 100644 --- a/packages/moreutils.rb +++ b/packages/moreutils.rb @@ -1,31 +1,33 @@ require 'package' class Moreutils < Package - description 'moreutils is a growing collection of the unix tools that nobody thought to write long ago when unix was young.' + description 'Growing collection of the unix tools that nobody thought to write long ago when unix was young.' homepage 'https://joeyh.name/code/moreutils/' - version '0.65' + version '0.69' license 'GPL-2' compatibility 'all' source_url "http://http.debian.net/debian/pool/main/m/moreutils/moreutils_#{version}.orig.tar.xz" - source_sha256 'ba0cfaa1ff6ead2b15c62a67292de66a366f9b815a09697b54677f7e15f5a2b2' - binary_compression 'tar.xz' + source_sha256 '2170c46219ce8d6f17702321534769dfbfece52148a78cd12ea73b5d3a72ff7c' + binary_compression 'tar.zst' binary_sha256({ - aarch64: 'af2d40444fb74ae8e2151b76d61417ddee993b69b8e6b6b30a65218612a8f523', - armv7l: 'af2d40444fb74ae8e2151b76d61417ddee993b69b8e6b6b30a65218612a8f523', - i686: '5bb54745aa76aa985f0cc0a6dd2a7c6efdcd314774df9d535183b657247c9540', - x86_64: '55222b8e4293e548f812542fa7447e5420c1b7098c0ae481e1f0a0357dd84ed9' + aarch64: 'c83203b78454cb54457723aa593e062b3bae81eb53ac29e5cf5eccb987b0fccf', + armv7l: 'c83203b78454cb54457723aa593e062b3bae81eb53ac29e5cf5eccb987b0fccf', + i686: 'f160028bbb5067a324e03d348c239c739b4bc890b8f721d767a51365ad537ad5', + x86_64: 'c0347330127aed4625b1108ca4144a5569dee1add6932c63d804589b9be177cc' }) depends_on 'docbook_xml' => :build depends_on 'libxslt' => :build - def self.build + def self.patch system "sed -i 's,PREFIX?=/usr,PREFIX?=#{CREW_PREFIX},' Makefile" system "sed -i 's,DOCBOOKXSL?=/usr/share/xml/docbook/stylesheet/docbook-xsl,DOCBOOKXSL?=#{CREW_PREFIX}/share/xml/docbook/stylesheet/docbook-xsl,' Makefile" system "sed -i 's,share/man,man,g' Makefile" - system "env #{CREW_ENV_OPTIONS} \ - make" + end + + def self.build + system 'make' end def self.install