aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2021-01-03 00:20:44 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-01-03 18:16:58 +0000
commitfc8c4a5a857f77bf9ee65cf905a9aedf3a01ddcb (patch)
treec96549294684b6e9caab7249e7d5bf8a090f66bc
parent96f9d3603b738e5a742093c7c6a359bc724b3f90 (diff)
downloadaports-fc8c4a5a857f77bf9ee65cf905a9aedf3a01ddcb.tar.gz
aports-fc8c4a5a857f77bf9ee65cf905a9aedf3a01ddcb.tar.bz2
aports-fc8c4a5a857f77bf9ee65cf905a9aedf3a01ddcb.tar.xz
main/nfs-utils: upgrade to 2.5.2
-rw-r--r--main/nfs-utils/APKBUILD10
-rw-r--r--main/nfs-utils/musl-configure_ac.patch30
2 files changed, 4 insertions, 36 deletions
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index 23a1211a32..faef7e2a2b 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=nfs-utils
-pkgver=2.5.1
-pkgrel=1
+pkgver=2.5.2
+pkgrel=0
pkgdesc="kernel-mode NFS"
url="https://linux-nfs.org/"
arch="all"
@@ -15,7 +15,6 @@ makedepends="autoconf automake bsd-compat-headers keyutils-dev krb5-dev
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-openrc rpcgen
libnfsidmap libnfsidmap-ldap"
source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgver.tar.xz
- musl-configure_ac.patch
musl-getservbyport.patch
musl-svcgssd-sysconf.patch
musl-time64.patch
@@ -65,7 +64,7 @@ check() {
}
package() {
- make -j1 DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir"/nfs.exports "$pkgdir"/etc/exports
mv "$pkgdir"/usr/sbin/rpc.statd "$pkgdir"/sbin/
@@ -112,8 +111,7 @@ ldap() {
mv "$pkgdir"/usr/lib/libnfsidmap/*ldap* "$subpkgdir"/usr/lib/libnfsidmap/
}
-sha512sums="efd90c3a436aacb9d267c2c787a1e57166933c8da7e2e5ace7251d04e5d4e0b9993f396132d5a3414fd37392e81685e9cf4b14088be449c45bbaf5f2443feb03 nfs-utils-2.5.1.tar.xz
-3f245b1870a47998d90cee191dba528dede7d2e18abad3f045864f95039057cda5a22708d89fcc086eeed452729c397a0284c73c1c7037277943a9890504e250 musl-configure_ac.patch
+sha512sums="84d284565fe9df966df735228bbc1457c03e625bfc8ccfe02587358807d7b127df6e5e0bbb1c988e5d731b9e16446d86e634a3aff4d88245a2f11f94fe6f6158 nfs-utils-2.5.2.tar.xz
94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748 musl-getservbyport.patch
52eeade44753f2002bf99d58ad4982086aab74ef8b14de46be547f23508197f58a6ff529145f96de7f031ac0bb7779b648d05fd981cdd91556dd13d068dfe57b musl-svcgssd-sysconf.patch
8efc48cdc6f8cfafe476241f95ca8dc89ac7b3402d4230d20ef1e066990c542b8350f9b11f495cc261f25f1a705e35445fa89ca729f0d162e0ed44b0d8a47344 musl-time64.patch
diff --git a/main/nfs-utils/musl-configure_ac.patch b/main/nfs-utils/musl-configure_ac.patch
deleted file mode 100644
index a96c7bd73a..0000000000
--- a/main/nfs-utils/musl-configure_ac.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -578,10 +578,10 @@
- -Wall \
- -Wextra \
- $rpcgen_cflags \
-- -Werror=missing-prototypes \
-- -Werror=missing-declarations \
-+ -Wmissing-prototypes \
-+ -Wmissing-declarations \
- -Werror=format=2 \
-- -Werror=undef \
-+ -Wundef \
- -Werror=missing-include-dirs \
- -Werror=strict-aliasing=2 \
- -Werror=init-self \
-@@ -617,11 +617,11 @@
-
- CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
- CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
--CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
-+#CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
- CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
- AX_GCC_FUNC_ATTRIBUTE([format])
-
--AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
-+AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"])
-
- # Make sure that $ACLOCAL_FLAGS are used during a rebuild
- AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])