diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 57 |
3 files changed, 45 insertions, 30 deletions
@@ -1,6 +1,6 @@ pkgbase = coreutils-hybrid pkgdesc = GNU coreutils / uutils-coreutils hybrid package. Uses stable uutils programs mixed with GNU counterparts if uutils counterpart is unfinished / buggy - pkgver = 8.32_0.0.6 + pkgver = 9.4_0.0.26 pkgrel = 1 url = https://www.gnu.org/software/coreutils/ arch = x86_64 @@ -8,7 +8,6 @@ pkgbase = coreutils-hybrid license = MIT makedepends = rust makedepends = cargo - makedepends = python-sphinx depends = glibc depends = acl depends = attr @@ -17,12 +16,10 @@ pkgbase = coreutils-hybrid depends = openssl provides = coreutils conflicts = coreutils - source = https://ftp.gnu.org/gnu/coreutils/coreutils-8.32.tar.xz - source = https://ftp.gnu.org/gnu/coreutils/coreutils-8.32.tar.xz.sig - source = uutils-coreutils-0.0.6.tar.gz::https://github.com/uutils/coreutils/archive/0.0.6.tar.gz - validpgpkeys = 6C37DC12121A5006BC1DB804DF6FD971306037D9 - sha512sums = 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 - sha512sums = SKIP - sha512sums = 55b3ca14930e79c69aeeb18496ae307393f9cd013e8aebecaffc5532f444c1f62b727ab03f9e23d9cc324a0a16a673adf08ea81522984c46faf0fad2815bb7d9 + options = !lto + source = https://ftp.gnu.org/gnu/coreutils/coreutils-9.4.tar.xz + source = uutils-coreutils-0.0.26.tar.gz::https://github.com/uutils/coreutils/archive/0.0.26.tar.gz + sha512sums = 7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5 + sha512sums = ba3eb06b4a11ba1adbe28fd53282827a148a3dd616db06230f7d31810418fd80f024e55ecd29ff2556b307f146bd99b083bd337912a900e7190db1c32bdf5cb0 pkgname = coreutils-hybrid diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..79de598d097a --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +pkg/ +src/ +*.tar.zst @@ -1,4 +1,4 @@ -# Maintainer: dr460nf1r3 <dr460nf1r3@garudalinux.org> +# Maintainer: dr460nf1r3 <dr460nf1r3 at garudalinux dot org> # Contributor: Sébastien "Seblu" Luttringer # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -7,9 +7,9 @@ pkgname=coreutils-hybrid _pkgname=coreutils __pkgname=uutils-coreutils -pkgver=8.32_0.0.6 -_pkgver=8.32 -__pkgver=0.0.6 +_pkgver=9.4 +__pkgver=0.0.26 +pkgver="$_pkgver"_"$__pkgver" pkgrel=1 pkgdesc='GNU coreutils / uutils-coreutils hybrid package. Uses stable uutils programs mixed with GNU counterparts if uutils counterpart is unfinished / buggy' arch=('x86_64') @@ -19,39 +19,54 @@ _url='https://github.com/uutils/coreutils' depends=('glibc' 'acl' 'attr' 'gmp' 'libcap' 'openssl') conflicts=('coreutils') provides=('coreutils') -makedepends=('rust' 'cargo' 'python-sphinx') -source=("https://ftp.gnu.org/gnu/$_pkgname/$_pkgname-$_pkgver.tar.xz"{,.sig} - "$__pkgname-$__pkgver.tar.gz::$_url/archive/$__pkgver.tar.gz") -validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady -sha512sums=('1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145' - 'SKIP' - '55b3ca14930e79c69aeeb18496ae307393f9cd013e8aebecaffc5532f444c1f62b727ab03f9e23d9cc324a0a16a673adf08ea81522984c46faf0fad2815bb7d9') +makedepends=('rust' 'cargo') +options=(!lto) +source=("https://ftp.gnu.org/gnu/$_pkgname/$_pkgname-$_pkgver.tar.xz" + "$__pkgname-$__pkgver.tar.gz::$_url/archive/$__pkgver.tar.gz") +sha512sums=('7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5' + 'ba3eb06b4a11ba1adbe28fd53282827a148a3dd616db06230f7d31810418fd80f024e55ecd29ff2556b307f146bd99b083bd337912a900e7190db1c32bdf5cb0') + +prepare() { + cd $_pkgname-$_pkgver + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + echo "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + : +} build() { # Build GNU coreutils without the stable uutils programs counterparts leaving out: stat, touch, realpath (genfstab broken), ln (no -s option) cd $_pkgname-$_pkgver ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --with-openssl \ - --enable-no-install-program="groups,hostname,kill,uptime,arch,base32,base64,basename,cat,chgrp,chmod,chown,chroot,cksum,comm,csplit,cut,dircolors,dirname,du,env,echo,expand,factor,false,fmt,fold,groups,head,hostid,hostname,id,kill,link,logname,mkdir,mkfifo,mknod,mktemp,mv,nice,nl,nohup,nproc,paste,pathk,pinky,printenv,ptx,pwd,readlink,relpath,rm,rmdir,seq,shred,shuf,sleep,stdbuf,sum,sync,tac,tee,timeout,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,who,wc,whoami,yes" + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-openssl \ + --enable-no-install-program="groups,hostname,kill,uptime,arch,base32,base64,basename,cat,chgrp,chmod,chown,chroot,cksum,comm,csplit,cut,dircolors,dirname,du,env,echo,expand,factor,false,fmt,fold,groups,head,hostid,hostname,id,kill,link,logname,mkdir,mkfifo,mknod,mktemp,mv,nice,nl,nohup,nproc,paste,pathk,pinky,printenv,ptx,pwd,readlink,relpath,rm,rmdir,seq,shred,shuf,sleep,stdbuf,sum,sync,tac,tee,timeout,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,who,wc,whoami,yes" } package() { # Install uutils-coreutils, skip the buggy parts cd $_pkgname-$__pkgver make \ - DESTDIR="$pkgdir" \ - PREFIX=/usr \ - MANDIR=/share/man/man1 \ - PROG_PREFIX= \ - install + DESTDIR="$pkgdir" \ + PREFIX=/usr \ + MANDIR=/share/man/man1 \ + PROG_PREFIX= \ + install # Install GNU coreutils over the uutils-coreutils cd $srcdir && cd $_pkgname-$_pkgver make DESTDIR="$pkgdir" install - + # Clean conflicts, Arch ships these in other apps cd $pkgdir/usr/bin rm groups hostname kill more uptime + + rm $pkgdir/usr/share/bash-completion/completions/* + rm $pkgdir/usr/share/man/man1/{groups.1,hostname.1,kill.1,more.1,uptime.1} } |