diff --git a/btrfs-progs/PKGBUILD b/btrfs-progs/PKGBUILD index 0751df5..75cdee2 100644 --- a/btrfs-progs/PKGBUILD +++ b/btrfs-progs/PKGBUILD @@ -7,28 +7,28 @@ pkgname=btrfs-progs pkgver=6.10.1 -pkgrel=01 +pkgrel=02 pkgdesc='Btrfs filesystem utilities w/o systemd' makedepends=('asciidoc' 'xmlto' 'python' 'python-setuptools' 'e2fsprogs' - 'reiserfsprogs' 'python-sphinx' 'python-sphinx_rtd_theme') + 'python-sphinx' 'python-sphinx_rtd_theme' 'automake' 'autoconf') depends=('glibc' 'util-linux-libs' 'lzo' 'zlib' 'zstd' 'libgcrypt') optdepends=('python: libbtrfsutil python bindings' - 'e2fsprogs: btrfs-convert' - 'reiserfsprogs: btrfs-convert') + 'e2fsprogs: btrfs-convert') #url='https://btrfs.wiki.kernel.org' url='https://btrfs.readthedocs.io' replaces=('btrfs-progs-unstable') conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') #options=(!staticlibs debug) ## uncomment this to have the debug pkg produced -options=(!staticlibs) -source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{xz,sign} +#options=(!staticlibs) +#source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{xz,sign} +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git?signed#tag=v${pkgver}" 'initcpio-install-btrfs' 'initcpio-hook-btrfs') install=btrfs-progs.install prepare() { - cd $pkgname-v$pkgver + cd $pkgname # apply patch from the source array (should be a pacman feature) local src for src in "${source[@]}"; do @@ -41,18 +41,19 @@ prepare() { } build() { - cd $pkgname-v$pkgver + cd $pkgname + ./autogen.sh ./configure --prefix=/usr --with-crypto=libgcrypt make } check() { - cd $pkgname-v$pkgver + cd $pkgname ./btrfs filesystem show } package() { - cd $pkgname-v$pkgver + cd $pkgname make DESTDIR="$pkgdir" install install_python # install bash completion (FS#44618) @@ -72,10 +73,16 @@ license=('GPL-2.0-only') validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B') -sha256sums=(25684696bc5b5d07c98f19d4bf7a48b53ab94870ca4c468a68af3df9e2c8a35e # btrfs-progs-v6.10.1.tar.xz - 8af0811fffe01e21a987747990348d4efacef27e35a8fdbb09fac17fb017e1e3 # btrfs-progs-v6.10.1.tar.sign +b2sums=('2704650efc795e8e01670306959781cf10d9837da227ffb15ffcd81d09751c8070e01edd834287c65fcb25dd0889a5060c36fc033affd32160b37c27270e137c' + '75659665a24f92bba1175a2fcae942d9851495c9cff88570b88a98dced4eb98fcc9879de044bfc7d560dbe1c71a20d7ae51ca4b7c2649f90d646b414e0864b6e' + '0d3c25d0cb6fdb8e8777723b5e199835fac25573bc8f7fcb248ccfeea7268752b7100dd2c8284529812f0b1d3943eceb5785f119959f89bffedcf30472a915db') +# '4408d0f81634c99f874a2dde8fc289f61d9e00d5c2d2efd465bcc90db69112604ec987a46858f48c0c2ce1cb4499de1355ad4baf847a74b40c148f8d7a516d22' +# '9601b31936e1c4b69e6be517f545c6520302fa946eb3203e2d50bd85e918c87a9512e3b40d4e8cee6b9ae4a3fe9fbde26052305beec10fa2c49732a08d1f6753') + +sha256sums=(710915b0cbcfdc4fc09daf5f135a867ee932324f450d47e427fe738da69e67e4 # btrfs-progs +# 8af0811fffe01e21a987747990348d4efacef27e35a8fdbb09fac17fb017e1e3 # btrfs-progs-v6.10.1.tar.sign bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs 35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs -## 69532ae2032888e8cd35a32b8795c82aa06bbfd9a70b2c6c3afa8fb221c553aa btrfs-progs-6.10.1-01-x86_64.pkg.tar.lz - +## +## diff --git a/btrfs-progs/PKGBUILD-arch b/btrfs-progs/PKGBUILD-arch index 5eceb1f..adbb72c 100644 --- a/btrfs-progs/PKGBUILD-arch +++ b/btrfs-progs/PKGBUILD-arch @@ -1,41 +1,38 @@ # Maintainer: Sébastien "Seblu" Luttringer +# Maintainer: Tobias Powalowski # Contributor: Tom Gundersen -# Contributor: Tobias Powalowski pkgname=btrfs-progs pkgver=6.10.1 -pkgrel=1 +pkgrel=2 pkgdesc='Btrfs filesystem utilities' arch=('x86_64') makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools' 'e2fsprogs' - 'reiserfsprogs' 'python-sphinx' 'python-sphinx_rtd_theme') + 'python-sphinx' 'python-sphinx_rtd_theme') depends=('glibc' 'util-linux-libs' 'lzo' 'zlib' 'zstd' 'libgcrypt' 'systemd-libs') optdepends=('python: libbtrfsutil python bindings' - 'e2fsprogs: btrfs-convert' - 'reiserfsprogs: btrfs-convert') + 'e2fsprogs: btrfs-convert') url='https://btrfs.readthedocs.io' replaces=('btrfs-progs-unstable') conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL-2.0-only') validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B') -source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{sign,xz} +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git?signed#tag=v${pkgver}" 'initcpio-install-btrfs' 'initcpio-hook-btrfs' 'btrfs-scrub@.service' 'btrfs-scrub@.timer' ) install=btrfs-progs.install -options=(!staticlibs) -sha256sums=('SKIP' - '25684696bc5b5d07c98f19d4bf7a48b53ab94870ca4c468a68af3df9e2c8a35e' - 'bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4' - '35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5' - 'eaa7af92d28bfa8940bb551560fd7be777f9f175292eaa72b5f6ef00fb240252' - '9a0b6cc23f7bd97b83b6c38dd2b4e4373fead8bd3ccfb82a47c72971e9d6f8ad') +b2sums=('2704650efc795e8e01670306959781cf10d9837da227ffb15ffcd81d09751c8070e01edd834287c65fcb25dd0889a5060c36fc033affd32160b37c27270e137c' + '75659665a24f92bba1175a2fcae942d9851495c9cff88570b88a98dced4eb98fcc9879de044bfc7d560dbe1c71a20d7ae51ca4b7c2649f90d646b414e0864b6e' + '0d3c25d0cb6fdb8e8777723b5e199835fac25573bc8f7fcb248ccfeea7268752b7100dd2c8284529812f0b1d3943eceb5785f119959f89bffedcf30472a915db' + '4408d0f81634c99f874a2dde8fc289f61d9e00d5c2d2efd465bcc90db69112604ec987a46858f48c0c2ce1cb4499de1355ad4baf847a74b40c148f8d7a516d22' + '9601b31936e1c4b69e6be517f545c6520302fa946eb3203e2d50bd85e918c87a9512e3b40d4e8cee6b9ae4a3fe9fbde26052305beec10fa2c49732a08d1f6753') prepare() { - cd $pkgname-v$pkgver + cd $pkgname # apply patch from the source array (should be a pacman feature) local src for src in "${source[@]}"; do @@ -48,18 +45,19 @@ prepare() { } build() { - cd $pkgname-v$pkgver + cd $pkgname + ./autogen.sh ./configure --prefix=/usr --with-crypto=libgcrypt make } check() { - cd $pkgname-v$pkgver + cd $pkgname ./btrfs filesystem show } package() { - cd $pkgname-v$pkgver + cd $pkgname make DESTDIR="$pkgdir" install install_python # install bash completion (FS#44618) @@ -75,4 +73,3 @@ package() { install -Dm644 btrfs-scrub@.timer "$pkgdir/usr/lib/systemd/system/btrfs-scrub@.timer" } -# vim:set ts=2 sw=2 ft=sh et: diff --git a/btrfs-progs/clean b/btrfs-progs/clean index 87100c4..2c34cf6 100644 --- a/btrfs-progs/clean +++ b/btrfs-progs/clean @@ -1 +1 @@ -rm -rf {src,pkg,*.tar.*} +rm -rf {src,pkg,*.tar.*,btrfs-progs} diff --git a/btrfs-progs/deps b/btrfs-progs/deps index 126fc2e..64186b2 100644 --- a/btrfs-progs/deps +++ b/btrfs-progs/deps @@ -1,7 +1,6 @@ xmlto python python-setuptools -reiserfsprogs lzo asciidoc python-sphinx @@ -9,3 +8,6 @@ python-typing_extensions python-sphinx_rtd_theme +git +automake +autoconf diff --git a/libnghttp2/PKGBUILD b/libnghttp2/PKGBUILD index 116b8ce..32d90e6 100644 --- a/libnghttp2/PKGBUILD +++ b/libnghttp2/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libnghttp2 -pkgver=1.62.1 +pkgver=1.63.0 pkgrel=01 pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library' url='https://nghttp2.org/' @@ -67,15 +67,15 @@ license=(MIT) validpgpkeys=('F4F3B91474D1EB29889BD0EF7E8403D5D673C366') # Tatsuhiro Tsujikawa -sha256sums=(SKIP - SKIP - SKIP - SKIP) - -sha512sums=('6ea6059af0aec4133aa83439dfa57bc3a7a3a33aae7028d2009dadd9912df4ede6a8337f053f17caec0276a2fcfca26d9397f5852f6edb9228553b76831fa658' +sha512sums=('b95341a958ea32c6131c9598cf75a3232b963a798d314a94df05b363a7b0a144014c48ac2a436fb867f742ce6761a8ca5a6a87cdbdee94d9fdcab5d3412415c5' 'SKIP' 'SKIP' 'SKIP') -## c8d381e7b8751bf102e128b14c7afa7bc6c8eefaa29d32a17af23c80b4d10c1c libnghttp2-1.62.1-01-x86_64.pkg.tar.lz +sha256sums=(1c3d53df82f24e19a4f47087c7991ac8e52e08bba0335adf3d1d4a26f4e6ef80 # nghttp2 + SKIP + SKIP + SKIP) + +## ca30c3d125917ff9f992cf061ec20678ace97edf7627f04d43fcaea09db62c47 libnghttp2-1.63.0-01-x86_64.pkg.tar.lz diff --git a/libnghttp2/PKGBUILD-arch b/libnghttp2/PKGBUILD-arch index 5d5a2cf..c053df5 100644 --- a/libnghttp2/PKGBUILD-arch +++ b/libnghttp2/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Zhuoyun Wei pkgname=libnghttp2 -pkgver=1.62.1 +pkgver=1.63.0 pkgrel=1 pkgdesc='Framing layer of HTTP/2 is implemented as a reusable C library' arch=('x86_64') @@ -17,7 +17,7 @@ source=("git+https://github.com/nghttp2/nghttp2.git#tag=v${pkgver}?signed" 'git+https://github.com/ngtcp2/munit.git' 'git+https://github.com/mruby/mruby.git' 'git+https://github.com/tatsuhiro-t/neverbleed.git') -sha512sums=('6ea6059af0aec4133aa83439dfa57bc3a7a3a33aae7028d2009dadd9912df4ede6a8337f053f17caec0276a2fcfca26d9397f5852f6edb9228553b76831fa658' +sha512sums=('b95341a958ea32c6131c9598cf75a3232b963a798d314a94df05b363a7b0a144014c48ac2a436fb867f742ce6761a8ca5a6a87cdbdee94d9fdcab5d3412415c5' 'SKIP' 'SKIP' 'SKIP') diff --git a/xfsprogs/PKGBUILD b/xfsprogs/PKGBUILD index bd7638b..2e5d3c0 100644 --- a/xfsprogs/PKGBUILD +++ b/xfsprogs/PKGBUILD @@ -6,50 +6,37 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=xfsprogs -pkgver=6.9.0 +pkgver=6.10.0 pkgrel=01 pkgdesc="XFS filesystem utilities w/o systemd" # url="https://xfs.org" url="https://xfs.wiki.kernel.org" -depends=('sh' 'util-linux-libs' 'device-mapper' 'libinih' 'liburcu') optdepends=('icu: for xfs_scrub' 'python: for xfs_scrub_all script' 'smtp-forwarder: for xfs_scrub_fail script') -makedepends=(git - device-mapper - eudev - libinih - liburcu - automake - autoconf - gettext - icu) -options=('!makeflags') +makedepends=(git device-mapper eudev libinih liburcu automake autoconf gettext icu) +#options=('!makeflags') #source=("git+https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git#tag=v${pkgver}") source=("git+https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git?signed#tag=v${pkgver}") build() { cd ${pkgname}-dev make configure - export OPTIMIZER="-march=${CARCH/_/-} -O1" - export DEBUG=-DNDEBUG - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib \ - --with-systemd-unit-dir=no + # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. + # However, we have to provide an empty value to avoid default + # flags. + export OPTIMIZER=" " + ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib \ + --with-systemd-unit-dir=/usr/lib/systemd/system \ + --localstatedir=/var --enable-editline make } package() { cd ${pkgname}-dev - make DIST_ROOT="$pkgdir" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev - chown -R root "$pkgdir" - chgrp -R root "$pkgdir" - # add hack as we cannot set rootlibdir - mv "$pkgdir"/lib/libhandle.so* "$pkgdir/usr/lib/" - rm -rf "$pkgdir/lib" - rm -rf $pkgdir/no + depends=('sh' 'util-linux-libs' 'device-mapper' 'libedit' 'libinih' 'liburcu') + make PKG_USER=root PKG_GROUP=root DIST_ROOT="${pkgdir}" \ + PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev } #---- arch license gpg-key & sha256sums ---- @@ -61,8 +48,9 @@ license=('GPL-2.0-only' 'LGPL-2.1-only') validpgpkeys=(2B8185919E8D248981869DED20AE1692E13DDEE0 # Eric Sandeen 4020459E58C1A52511F5399113F703E6C11CF6F0) # Carlos Maiolino -b2sums=('6f516850d2d79e0dd55b8ba0d144f8b9908510186a7b9c547736fc6cb40a2202b83ae1b62aeecb014dd2be70202aa94a44d6dde07756f6f77cb104181e50b693') +b2sums=('38e1a9b6b38672673b7b28cb2038c76a54d9726265c95acc2766c177169d8c661add3d0c2c42fbb5a69b57f58ac49d5883bfa41aab78d770d4788bd13d9cb861') -sha256sums=(d98c620b2b32bb7e9307b0770c8905a0884134e2c41536eaf9733c004889564f) # xfsprogs-dev +sha256sums=(5ae3a5da3665059d926a90c0aa73915ed66e2bfd10b45b8f2d031ea5de928fdc) # xfsprogs-dev + +## 6f7e598bf47cafa8eec9de04f3e63d7c9ccf3acf2c2712b9206b86a21b38a559 xfsprogs-6.10.0-01-x86_64.pkg.tar.lz -## 0ff314d2482f154ef9dc5da5da30d177ae3db3f162c960ee303e3519f296f349 xfsprogs-6.9.0-01-x86_64.pkg.tar.lz diff --git a/xfsprogs/PKGBUILD-arch b/xfsprogs/PKGBUILD-arch index d702402..56350a7 100644 --- a/xfsprogs/PKGBUILD-arch +++ b/xfsprogs/PKGBUILD-arch @@ -1,20 +1,19 @@ # Maintainer: Tobias Powalowski pkgname=xfsprogs -pkgver=6.9.0 +pkgver=6.10.0 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('x86_64') license=('GPL-2.0-only' 'LGPL-2.1-only') url="https://xfs.wiki.kernel.org" -depends=('sh' 'util-linux-libs' 'device-mapper' 'libinih' 'liburcu') +depends=('sh' 'util-linux-libs' 'device-mapper' 'libedit' 'libinih' 'liburcu') optdepends=('icu: for xfs_scrub' - 'python: for xfs_scrub_all script' + 'python: for xfs_scrub_all script' 'smtp-forwarder: for xfs_scrub_fail script') makedepends=('git' 'icu') -options=('!makeflags') source=("git+https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git?signed#tag=v${pkgver}") -b2sums=('6f516850d2d79e0dd55b8ba0d144f8b9908510186a7b9c547736fc6cb40a2202b83ae1b62aeecb014dd2be70202aa94a44d6dde07756f6f77cb104181e50b693') +b2sums=('38e1a9b6b38672673b7b28cb2038c76a54d9726265c95acc2766c177169d8c661add3d0c2c42fbb5a69b57f58ac49d5883bfa41aab78d770d4788bd13d9cb861') validpgpkeys=( '2B8185919E8D248981869DED20AE1692E13DDEE0' # Eric Sandeen '4020459E58C1A52511F5399113F703E6C11CF6F0' # Carlos Maiolino @@ -23,18 +22,18 @@ validpgpkeys=( build() { cd ${pkgname}-dev make configure - export OPTIMIZER="-march=${CARCH/_/-} -O1" - export DEBUG=-DNDEBUG - ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib --with-systemd-unit-dir=/usr/lib/systemd/system + # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. + # However, we have to provide an empty value to avoid default + # flags. + export OPTIMIZER=" " + ./configure --prefix=/usr --sbindir=/usr/bin --libexecdir=/usr/lib \ + --with-systemd-unit-dir=/usr/lib/systemd/system \ + --localstatedir=/var --enable-editline make } package() { cd ${pkgname}-dev - make DIST_ROOT="${pkgdir}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev - chown -R root "$pkgdir" - chgrp -R root "$pkgdir" - # add hack as we cannot set rootlibdir - mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/" - rm -rf "${pkgdir}/lib" + make PKG_USER=root PKG_GROUP=root DIST_ROOT="${pkgdir}" \ + PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev } diff --git a/xfsprogs/deps b/xfsprogs/deps index 082a71b..afda7ce 100644 --- a/xfsprogs/deps +++ b/xfsprogs/deps @@ -1,10 +1,12 @@ git -device-mapper -libinih -liburcu -automake -autoconf -gettext -libxml2 +icu eudev +device-mapper +libinih +liburcu +automake +autoconf +gettext + +libedit