aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Tatje <jan@jnt.io>2019-06-07 02:13:30 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-19 14:55:17 +0000
commit4f16e02a6df08b49f5f0c493b658ec9475bc3055 (patch)
tree5ddb9a713fcb69894bc683f1f4ad685f1c78c79e
parent9f1deab7a8bb37802d7d30f6daf487a4853c315b (diff)
downloadaports-4f16e02a6df08b49f5f0c493b658ec9475bc3055.tar.gz
aports-4f16e02a6df08b49f5f0c493b658ec9475bc3055.tar.bz2
aports-4f16e02a6df08b49f5f0c493b658ec9475bc3055.tar.xz
main/nfs-utils: fix nfsidmap nss module
-rw-r--r--main/nfs-utils/APKBUILD4
-rw-r--r--main/nfs-utils/musl-svcgssd-sysconf.patch24
2 files changed, 23 insertions, 5 deletions
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index a1804f3299..d2aa099982 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=nfs-utils
pkgver=2.3.4
-pkgrel=0
+pkgrel=1
pkgdesc="kernel-mode NFS"
url="http://linux-nfs.org"
arch="all"
@@ -123,7 +123,7 @@ sha512sums="64a3a9ab4142d556e411351618e409d7402a9e8d1ebe6c124d1f75f59da271f3a0c4
674ecf2c4bc8e9364ddd0f34cc03c96674753494cbc5a5d157bd70ed4342ff90356c3e85c544510648dbe90cb43b7fd83ba50653bddffc4b3b5550367b6d0b8e nfs-utils-mtab-sym.patch
99609058351733dc9d02bd90156ded96bb04924b7c00c07be485e06f60d5fb77d1dbc4deca7d9fb88c5bb8fe96c483c5ec5a8fac26ca61fd351304def79b057d musl-configure_ac.patch
94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748 musl-getservbyport.patch
-16b34801019186cebae77d92b3df0f679aeb51eabf5c91714d2d2907cecacb6a151cd582c900dd629a413424b545823e97ee00b8de0c90248d3fed9bf603a270 musl-svcgssd-sysconf.patch
+8499b0d129a86d56736720b6bd2caee042f9ad9a3504ba88d4ccc5f29fa55bc63ed015f84b5dcf958f1b05907e8cdb2e76fd6d56aad3a17c839aee564573e2e0 musl-svcgssd-sysconf.patch
b28b0dcd23ad76f78921eebf7373c4480b3cc3d8f64e990f43534ecd010f6f936704b0fbc0d907e3f78b73a56f451101d2920727f1373ce7aa261080fbfccd55 sqlite-printf.patch
9647d8f4a64a95a7abf5e26f040cf5567670e2194ce307a971a36eaae7fe490af5a494e7b380a48c88e309f4c25777d73d6c140b224aeed829fbc46b1d0baa64 limits.patch
f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd
diff --git a/main/nfs-utils/musl-svcgssd-sysconf.patch b/main/nfs-utils/musl-svcgssd-sysconf.patch
index aab0e9612b..7e658013b8 100644
--- a/main/nfs-utils/musl-svcgssd-sysconf.patch
+++ b/main/nfs-utils/musl-svcgssd-sysconf.patch
@@ -87,7 +87,7 @@
buf = malloc(buflen);
if (!buf)
goto out;
-@@ -119,8 +123,12 @@
+@@ -119,9 +123,13 @@
struct group *gr = NULL;
struct group grbuf;
char *buf;
@@ -95,9 +95,27 @@
+ long scbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ size_t buflen = 1024;
int err;
-+
+
+ if (scbuflen > 0)
+ buflen = (size_t)scbuflen;
-
++
if (domain == NULL)
domain = get_default_domain();
+
+@@ -192,12 +200,13 @@
+ {
+ struct passwd *pw;
+ struct pwbuf *buf;
+- size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
++ long scbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
++ size_t buflen = 1024;
+ char *localname;
+ int err = ENOMEM;
+
+- if (buflen > UINT_MAX)
+- goto err;
++ if (scbuflen > 0)
++ buflen = (size_t)scbuflen;
+
+ buf = malloc(sizeof(*buf) + buflen);
+ if (buf == NULL)