From a36d41132e16304b40b9c0a8733c6f13f43bbe0f Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Thu, 11 Aug 2022 06:59:01 +0300 Subject: [PATCH] upg gpgme libarchive libnftnl nfs-utils dbus-broker --- dbus-broker/clean | 1 + gpgme/PKGBUILD | 10 ++++++---- gpgme/PKGBUILD-arch | 4 ++-- gpgme/deps | 2 ++ libnftnl/PKGBUILD | 7 +++---- libnftnl/PKGBUILD-arch | 4 ++-- libnftnl/deps | 1 + libtirpc/PKGBUILD | 4 +++- libverto/deps | 3 ++- links/deps | 1 - nfs-utils/PKGBUILD | 35 ++++++++++++++++++++++++----------- nfs-utils/PKGBUILD-arch | 37 ++++++++++++++++++++++++++----------- nfs-utils/PKGBUILD-oba | 8 +++++--- nfs-utils/deps | 2 +- nfs-utils/sysusers.d | 1 + 15 files changed, 79 insertions(+), 41 deletions(-) create mode 100644 dbus-broker/clean create mode 100644 nfs-utils/sysusers.d diff --git a/dbus-broker/clean b/dbus-broker/clean new file mode 100644 index 0000000..2bbf62c --- /dev/null +++ b/dbus-broker/clean @@ -0,0 +1 @@ +rm -rf {src,pkg,dbus-bro*.tar.xz*} diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD index dabf4dd..dc1122f 100644 --- a/gpgme/PKGBUILD +++ b/gpgme/PKGBUILD @@ -7,12 +7,12 @@ pkgbase=gpgme pkgname=(gpgme qgpgme python-gpgme) -pkgver=1.17.1 +pkgver=1.18.0 pkgrel=01 _python_ver=3.10 pkgdesc="A C wrapper library for GnuPG" arch=('x86_64') -#options=('debug') +#options=('debug') ## uncomment this to have the debug pkg produced url='https://www.gnupg.org/related_software/gpgme/' makedepends=('libgpg-error' 'gnupg' 'qt5-base' 'python' 'swig') source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig} @@ -92,6 +92,8 @@ license=('LGPL') validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020) -sha256sums=(711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f # gpgme-1.17.1.tar.bz2 - 3e6072bfd2cdca46dcb28fb6bd43e89d51791c085608183c395e3bb2dad8b032 # gpgme-1.17.1.tar.bz2.sig +sha256sums=(361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e # gpgme-1.18.0.tar.bz2 + 105c722a34526516b9cc53e5690ee8c29651a9dcd3a0235f4009e94ef4fd684d # gpgme-1.18.0.tar.bz2.sig 5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a) # python310.patch + + diff --git a/gpgme/PKGBUILD-arch b/gpgme/PKGBUILD-arch index e996073..8526ac7 100644 --- a/gpgme/PKGBUILD-arch +++ b/gpgme/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgbase=gpgme pkgname=(gpgme qgpgme python-gpgme) -pkgver=1.17.1 +pkgver=1.18.0 pkgrel=1 _python_ver=3.10 pkgdesc='A C wrapper library for GnuPG' @@ -16,7 +16,7 @@ options=('debug') validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020) source=("https://www.gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2"{,.sig} python310.patch) -sha256sums=('711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f' +sha256sums=('361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e' 'SKIP' '5de2f6bcb6b30642d0cbc3fbd86803c9460d732f44a526f44cedee8bb78d291a') diff --git a/gpgme/deps b/gpgme/deps index 9c494fe..af0d8af 100644 --- a/gpgme/deps +++ b/gpgme/deps @@ -1,3 +1,5 @@ qt5-base python swig + + diff --git a/libnftnl/PKGBUILD b/libnftnl/PKGBUILD index ee9e913..b92fb77 100644 --- a/libnftnl/PKGBUILD +++ b/libnftnl/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libnftnl -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=01 pkgdesc='Netfilter library providing interface to the nf_tables subsystem' arch=('x86_64') @@ -49,6 +49,5 @@ license=('GPL2') validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team -sha256sums=(9efc004f9d15918d68f9e98e194d55e030168f33bb67c3e7a545b740c9ed6d0a # libnftnl-1.2.2.tar.bz2 - 893c75db6bd4a7a82024d50aff537d5d997136507c67252206f71c5de2a0f36e) # libnftnl-1.2.2.tar.bz2.sig - +sha256sums=(e916ea9b79f9518560b9a187251a7c042442a9ecbce7f36be7908888605d0255 # libnftnl-1.2.3.tar.bz2 + 4df271636116b55efd4945fd6fbc5a43f7bba309174180df7ab211264cd58606) # libnftnl-1.2.3.tar.bz2.sig diff --git a/libnftnl/PKGBUILD-arch b/libnftnl/PKGBUILD-arch index d0d2210..57d7fa5 100644 --- a/libnftnl/PKGBUILD-arch +++ b/libnftnl/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: Sébastien Luttringer pkgname=libnftnl -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc='Netfilter library providing interface to the nf_tables subsystem' arch=('x86_64') @@ -10,7 +10,7 @@ license=('GPL2') depends=('libmnl') validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team source=("https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.bz2"{,.sig}) -sha256sums=('9efc004f9d15918d68f9e98e194d55e030168f33bb67c3e7a545b740c9ed6d0a' +sha256sums=('e916ea9b79f9518560b9a187251a7c042442a9ecbce7f36be7908888605d0255' 'SKIP') prepare() { diff --git a/libnftnl/deps b/libnftnl/deps index b28b04f..fd40910 100644 --- a/libnftnl/deps +++ b/libnftnl/deps @@ -1,3 +1,4 @@ + diff --git a/libtirpc/PKGBUILD b/libtirpc/PKGBUILD index e549cf1..9b63110 100644 --- a/libtirpc/PKGBUILD +++ b/libtirpc/PKGBUILD @@ -1,7 +1,8 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libtirpc @@ -34,3 +35,4 @@ package() { license=('BSD') sha256sums=(6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3) # libtirpc-1.3.3.tar.bz2 + diff --git a/libverto/deps b/libverto/deps index dd6fade..139597f 100644 --- a/libverto/deps +++ b/libverto/deps @@ -1 +1,2 @@ -libevent + + diff --git a/links/deps b/links/deps index 24c7675..450308b 100644 --- a/links/deps +++ b/links/deps @@ -1,5 +1,4 @@ gpm -libevent libtiff libpng libxt diff --git a/nfs-utils/PKGBUILD b/nfs-utils/PKGBUILD index 89ccf9a..1912cd2 100644 --- a/nfs-utils/PKGBUILD +++ b/nfs-utils/PKGBUILD @@ -7,14 +7,16 @@ pkgbase=nfs-utils pkgdesc="Support programs for Network File Systems - w/o ipv6 gssproxy & systemd " pkgname=('nfs-utils' 'nfsidmap') -pkgver=2.6.1 -pkgrel=02 +pkgver=2.6.2 +pkgrel=01 arch=('x86_64') url='http://nfs.sourceforge.net' makedepends=('libevent' 'sqlite' 'rpcsvc-proto' 'device-mapper') # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary +#options=('debug') ### uncomment this to have the debug pkg produced source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign} - exports) + exports + sysusers.d) # https://www.kernel.org/pub/linux/utils/nfs-utils/2.5.4/sha256sums.asc ## @@ -25,9 +27,10 @@ source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-$ prepare() { cd "${pkgbase}"-${pkgver} - # fix hardcoded sbin path to our needs + # fix hardcoded sbin/libexec path to our needs sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am sed -i "s|sbin|bin|" utils/nfsidmap/id_resolver.conf + sed -i "s|libexec|bin|" tools/nfsrahead/99-nfs.rules autoreconf -vfi } @@ -36,14 +39,16 @@ build() { ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ + --libexecdir=/usr/bin \ + --with-statedir=/var/lib/nfs \ + --with-statdpath=/var/lib/nfs/statd \ + --with-start-statd=/usr/bin/start-statd \ --enable-nfsv4server \ --disable-gss \ --without-tcp-wrappers \ - --with-statedir=/var/lib/nfs \ --disable-ipv6 \ --enable-libmount-mount \ --enable-mountconfig \ - --with-start-statd=/usr/bin/start-statd \ --without-systemd sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make @@ -51,7 +56,8 @@ build() { check() { cd "${pkgbase}"-${pkgver} - make -k check || /bin/true +# make -k check || /bin/true + make check } package_nfs-utils() { @@ -63,7 +69,7 @@ package_nfs-utils() { var/lib/nfs/{etab,rmtab}) depends=('rpcbind' 'nfsidmap' 'libevent' 'device-mapper') optdepends=('sqlite: for nfsdcltrack usage' - 'python: for nfsiostat, nfsdclnts and mountstats usage') + 'python: for rpcctl, nfsiostat, nfsdclnts and mountstats usage') cd "${pkgbase}"-${pkgver} make DESTDIR="$pkgdir" install @@ -86,6 +92,12 @@ package_nfs-utils() { mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs mkdir "$pkgdir"/var/lib/nfs/v4recovery + # systemd sysusers - FS#75536 + install -D -m 644 ../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/rpcuser.conf + chown -Rv 34:34 "${pkgdir}"/var/lib/nfs/statd + chmod -R 700 "${pkgdir}"/var/lib/nfs/statd + chmod 644 "${pkgdir}"/var/lib/nfs/statd/state + # nfsidmap cleanup rm -vrf "$pkgdir"/usr/include #/nfsid* rm -vrf "$pkgdir"/usr/lib/libnfsidmap* @@ -115,7 +127,8 @@ license=('GPL2') validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson -sha256sums=(60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df # nfs-utils-2.6.1.tar.xz - a95a856e17dc06f1fc86055c0e44f1d24f9cd6150b5efbfc2cf4e45045863d41 # nfs-utils-2.6.1.tar.sign - b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d) # exports +sha256sums=(5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011 # nfs-utils-2.6.2.tar.xz + 65da9d48c41e5b004289fb7941060936f1366e8c34805ce4edaf570e255d9f19 # nfs-utils-2.6.2.tar.sign + b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d # exports + 8e1b6aa59cf5539b9da13cfec217b3ca7b6c32e08df3b0a204901ed2891b2ded) # sysusers.d diff --git a/nfs-utils/PKGBUILD-arch b/nfs-utils/PKGBUILD-arch index c605ce9..43c80fb 100644 --- a/nfs-utils/PKGBUILD-arch +++ b/nfs-utils/PKGBUILD-arch @@ -7,26 +7,32 @@ pkgbase=nfs-utils pkgname=('nfs-utils' 'nfsidmap') -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 arch=('x86_64') url='http://nfs.sourceforge.net' makedepends=('libevent' 'sqlite' 'rpcsvc-proto' 'device-mapper') +options=('debug') # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign} - exports) -# https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.6.1/sha256sums.asc -sha256sums=('60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df' + exports + sysusers.d) +# https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.6.2/sha256sums.asc +sha256sums=('5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011' 'SKIP' - 'b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d') + 'b8238b74179f7e1626db2b637671ddc17288a1c5b7692954ae6d2fbb1be3788d' + '8e1b6aa59cf5539b9da13cfec217b3ca7b6c32e08df3b0a204901ed2891b2ded') validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson prepare() { cd "${pkgbase}"-${pkgver} - # fix hardcoded sbin path to our needs + # fix hardcoded sbin/libexec path to our needs sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am sed -i "s|sbin|bin|" utils/nfsidmap/id_resolver.conf + sed -i "s|sbin|usr/bin|" systemd/50-nfs.conf + sed -i "s|/sbin|/usr/bin|" systemd/50-nfs.conf + sed -i "s|libexec|bin|" tools/nfsrahead/99-nfs.rules autoreconf -vfi } @@ -35,14 +41,16 @@ build() { ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc \ + --libexecdir=/usr/bin \ + --with-statedir=/var/lib/nfs \ + --with-statdpath=/var/lib/nfs/statd \ + --with-start-statd=/usr/bin/start-statd \ --enable-nfsv4server \ --enable-gss \ --without-tcp-wrappers \ - --with-statedir=/var/lib/nfs \ --enable-ipv6 \ --enable-libmount-mount \ --enable-mountconfig \ - --with-start-statd=/usr/bin/start-statd \ --with-systemd sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make @@ -50,7 +58,8 @@ build() { check() { cd "${pkgbase}"-${pkgver} - make -k check || /bin/true + #make -k check || /bin/true + make check } package_nfs-utils() { @@ -62,7 +71,7 @@ package_nfs-utils() { var/lib/nfs/{etab,rmtab}) depends=('rpcbind' 'nfsidmap' 'gssproxy' 'libevent' 'device-mapper') optdepends=('sqlite: for nfsdcltrack usage' - 'python: for nfsiostat, nfsdclnts and mountstats usage') + 'python: for rpcctl, nfsiostat, nfsdclnts and mountstats usage') cd "${pkgbase}"-${pkgver} make DESTDIR="$pkgdir" install @@ -72,7 +81,7 @@ package_nfs-utils() { install -d -m 755 "$pkgdir"/usr/share/doc/$pkgname install -D -m 644 systemd/README "$pkgdir"/usr/share/doc/$pkgname/README.systemd - + # docs install -m 644 {NEWS,README} "$pkgdir"/usr/share/doc/$pkgname/ @@ -86,6 +95,12 @@ package_nfs-utils() { mkdir -m 555 "$pkgdir"/var/lib/nfs/rpc_pipefs mkdir "$pkgdir"/var/lib/nfs/v4recovery + # systemd sysusers - FS#75536 + install -D -m 644 ../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/rpcuser.conf + chown -Rv 34:34 "${pkgdir}"/var/lib/nfs/statd + chmod -R 700 "${pkgdir}"/var/lib/nfs/statd + chmod 644 "${pkgdir}"/var/lib/nfs/statd/state + # nfsidmap cleanup rm -vrf "$pkgdir"/usr/include #/nfsid* rm -vrf "$pkgdir"/usr/lib/libnfsidmap* diff --git a/nfs-utils/PKGBUILD-oba b/nfs-utils/PKGBUILD-oba index d1b76bb..1093008 100644 --- a/nfs-utils/PKGBUILD-oba +++ b/nfs-utils/PKGBUILD-oba @@ -8,8 +8,8 @@ # DESCRIPTION ] pkgbase=nfs-utils -pkgver=2.5.4 -pkgrel=3 +pkgver=2.6.1 +pkgrel=2 pkgdesc="Support programs for Network File Systems" url='https://nfs.sourceforge.net' @@ -164,4 +164,6 @@ validpgpkeys=( 'E1B71E339E20A10A676F7CB69AFB1D681A125177' # Steve Dickson ) -sha512sums=('') +sha256sums=('60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df' + 'SKIP' + 'd4862c011896371acba8a674be9942c9fa226a683f2fb11f62cebc5fd9f38df2') diff --git a/nfs-utils/deps b/nfs-utils/deps index 8b83bc9..c980370 100644 --- a/nfs-utils/deps +++ b/nfs-utils/deps @@ -1,6 +1,6 @@ -libevent rpcsvc-proto device-mapper autoconf gettext automake + diff --git a/nfs-utils/sysusers.d b/nfs-utils/sysusers.d new file mode 100644 index 0000000..4399cd7 --- /dev/null +++ b/nfs-utils/sysusers.d @@ -0,0 +1 @@ +u rpcuser 34 "RPC Service User" /var/lib/nfs