diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-12 14:16:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-12 14:16:54 +0000 |
| commit | 35038f4a2af51efed7265a064fd4a43ffd8a4b95 (patch) | |
| tree | 781c3633801f9fb3abfe269f57e2dc09df0bf8d6 /main/nfs-utils/0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch | |
| parent | 31c5760db1020fee1de508e573f21a284c11c8e4 (diff) | |
| download | aports-35038f4a2af51efed7265a064fd4a43ffd8a4b95.tar.bz2 aports-35038f4a2af51efed7265a064fd4a43ffd8a4b95.tar.xz | |
main/nfs-utils: build fixes for musl
Diffstat (limited to 'main/nfs-utils/0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch')
| -rw-r--r-- | main/nfs-utils/0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/main/nfs-utils/0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch b/main/nfs-utils/0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch new file mode 100644 index 0000000000..2544a59646 --- /dev/null +++ b/main/nfs-utils/0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch @@ -0,0 +1,61 @@ +From c2fc4ac0819b4e6f9591b86245ad537906f9d0cb Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 12 Feb 2014 13:54:31 +0000 +Subject: [PATCH 4/7] Allow usage of getrpcbynumber() when getrpcbynumber_r() + is unavailable + +--- + configure.ac | 6 +----- + support/nfs/svc_socket.c | 6 ++++++ + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bf433d6..c758cc7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -247,9 +247,6 @@ AC_CHECK_FUNC([connect], , + AC_CHECK_FUNC([getaddrinfo], , + [AC_MSG_ERROR([Function 'getaddrinfo' not found.])]) + +-AC_CHECK_FUNC([getrpcbynumber], , +- [AC_MSG_ERROR([Function 'getrpcbynumber' not found.])]) +- + AC_CHECK_FUNC([getservbyname], , + [AC_MSG_ERROR([Function 'getservbyname' not found.])]) + +@@ -408,12 +405,11 @@ AC_FUNC_STAT + AC_FUNC_VPRINTF + AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ + gethostbyaddr gethostbyname gethostname getmntent \ +- getnameinfo getrpcbyname getifaddrs \ ++ getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \ + gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ + ppoll realpath rmdir select socket strcasecmp strchr strdup \ + strerror strrchr strtol strtoul sigprocmask]) + +- + dnl ************************************************************* + dnl Check for data sizes + dnl ************************************************************* +diff --git a/support/nfs/svc_socket.c b/support/nfs/svc_socket.c +index f56f310..61ccf5b 100644 +--- a/support/nfs/svc_socket.c ++++ b/support/nfs/svc_socket.c +@@ -42,8 +42,14 @@ int getservport(u_long number, const char *proto) + struct servent servbuf, *servp = NULL; + int ret; + ++#if HAVE_GETRPCBYNUMBER_R + ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata, + &rpcp); ++#else ++ rpcp = getrpcbynumber(number); ++ ret = 0; ++#endif ++ + if (ret == 0 && rpcp != NULL) { + /* First try name. */ + ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, +-- +1.8.5.3 + |