diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-04 12:19:22 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-12-04 12:19:22 +0000 |
commit | 84ad0cd074a4f7e337d0f4f0d4b1fea5a24bea5f (patch) | |
tree | ab98b518ef39f4e1bf34f6419b72fb033c819ae4 /main/nfs-utils | |
parent | 493f103a5352da545c8378ec2757ed9609b09856 (diff) | |
download | aports-84ad0cd074a4f7e337d0f4f0d4b1fea5a24bea5f.tar.bz2 aports-84ad0cd074a4f7e337d0f4f0d4b1fea5a24bea5f.tar.xz |
main/nfs-utils: fix previous patch
Diffstat (limited to 'main/nfs-utils')
-rw-r--r-- | main/nfs-utils/APKBUILD | 4 | ||||
-rw-r--r-- | main/nfs-utils/uclibc-getaddrinfo-canonname.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD index 3e553177b..fa0b9b49f 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=1.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="kernel-mode NFS" url="http://nfs.sourceforge.net/" arch="all" @@ -90,5 +90,5 @@ d514fb87ce5de9909f43d99012352f09 nfsmount.initd 09135438d6df50b868bbe5a2260f973c nfs.confd 4f1bb7b2412ce5952ecb5ec22d8ed99d nfs.exports a3a7338f8de3ac37c1ffc05bdcb77d16 nfs-utils-mtab-sym.patch -8d4de0a448ef4d228646570cfc17fd7f uclibc-getaddrinfo-canonname.patch +37a82a3a81410b483790ca30d564f4ba uclibc-getaddrinfo-canonname.patch 3a1e3ff3de39a211f6d4d3ecb16b37aa osd_login.patch" diff --git a/main/nfs-utils/uclibc-getaddrinfo-canonname.patch b/main/nfs-utils/uclibc-getaddrinfo-canonname.patch index 081195833..ae26726ea 100644 --- a/main/nfs-utils/uclibc-getaddrinfo-canonname.patch +++ b/main/nfs-utils/uclibc-getaddrinfo-canonname.patch @@ -4,21 +4,21 @@ .ai_protocol = (int)IPPROTO_UDP, .ai_flags = AI_NUMERICHOST, .ai_family = AF_UNSPEC, -+ .ai_socktype = 0, ++ .ai_socktype = 0, }; struct sockaddr_in sin; int error, inet4; -@@ -382,7 +383,9 @@ +@@ -348,7 +349,9 @@ /* * getaddrinfo(AI_NUMERICHOST) never fills in ai_canonname -+ * ...well, it does on uclibc. ++ * ... well it does on __UCLIBC__ */ +#ifndef __UCLIBC__ if (ai != NULL) { + free(ai->ai_canonname); /* just in case */ ai->ai_canonname = strdup(buf); - if (ai->ai_canonname == NULL) { -@@ -390,6 +393,7 @@ +@@ -357,6 +360,7 @@ ai = NULL; } } |