diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-24 10:53:35 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-24 10:55:09 +0200 |
| commit | 3370b8ac909fa744b11faf4a424e78ae54014405 (patch) | |
| tree | 556244cfaedfcb3dcafa46c7ee41c2dac7ead31a /main/nfs-utils | |
| parent | 675ba816c59aa240f7c8e1f34a209ce11b82e806 (diff) | |
| download | aports-3370b8ac909fa744b11faf4a424e78ae54014405.tar.bz2 aports-3370b8ac909fa744b11faf4a424e78ae54014405.tar.xz | |
main/nfs-utils: fix segfault in nfsd
There are 2 different versions of basename and apparently the gnu
version from string.h segfault. We include libgen.h so we get the
posix version
Diffstat (limited to 'main/nfs-utils')
| -rw-r--r-- | main/nfs-utils/0001-nfsd-include-libgen.h-for-basename.patch | 27 | ||||
| -rw-r--r-- | main/nfs-utils/APKBUILD | 6 |
2 files changed, 32 insertions, 1 deletions
diff --git a/main/nfs-utils/0001-nfsd-include-libgen.h-for-basename.patch b/main/nfs-utils/0001-nfsd-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..72bc0097f8 --- /dev/null +++ b/main/nfs-utils/0001-nfsd-include-libgen.h-for-basename.patch @@ -0,0 +1,27 @@ +From aa09509de961a5859f0518bd55ff3c8ca6c8ef5c Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 24 Apr 2014 10:38:26 +0200 +Subject: [PATCH] nfsd: include libgen.h for basename + +according POSIX basename(3) should have an #include <libgen.h> + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + utils/nfsd/nfsd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c +index 73d6a92..b781c20 100644 +--- a/utils/nfsd/nfsd.c ++++ b/utils/nfsd/nfsd.c +@@ -19,6 +19,7 @@ + #include <errno.h> + #include <getopt.h> + #include <netdb.h> ++#include <libgen.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> +-- +1.9.2 + diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD index bbeb9a1f47..0c11047d1f 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.9 -pkgrel=2 +pkgrel=3 pkgdesc="kernel-mode NFS" url="http://nfs.sourceforge.net/" arch="all" @@ -27,6 +27,7 @@ source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2 nfs.exports 0001-conffile-use-standard-uint-_t-and-unsigned-char.patch + 0001-nfsd-include-libgen.h-for-basename.patch 0002-Fix-header-include-for-definition-of-NULL.patch 0003-replace-__attribute_malloc__-with-the-more-portable-.patch 0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch @@ -114,6 +115,7 @@ d514fb87ce5de9909f43d99012352f09 nfsmount.initd 09135438d6df50b868bbe5a2260f973c nfs.confd 4f1bb7b2412ce5952ecb5ec22d8ed99d nfs.exports e78522fa674479e26efbb07e1f533343 0001-conffile-use-standard-uint-_t-and-unsigned-char.patch +72e31ddc393b69a11df5301a2ed30aac 0001-nfsd-include-libgen.h-for-basename.patch db146c3e263de1825ec94dd62167d79c 0002-Fix-header-include-for-definition-of-NULL.patch 4bf2fd07d60fbebb0b3dd7d5cef34b9b 0003-replace-__attribute_malloc__-with-the-more-portable-.patch 14b241265b47f698aae7818d2cfb3051 0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch @@ -133,6 +135,7 @@ f1c460d8b0e91e54a551397d755135d05a3728d81de596535bf8bda074455677 rpc.svcgssd.in 9ca3b7dfbac5bedd818a3637805380f4e873ef8e809c21c26f410c86ac16e03e nfs.confd f2aaf1c92e07172adeb65f7f2bc0140c533ae453a3477e99be677ef2e05f2d4b nfs.exports a49a858dd127aeff608e2facd3734765e6113e2e26120d1b5a1a1feacb270157 0001-conffile-use-standard-uint-_t-and-unsigned-char.patch +0abd3cc27e48b8792ec919b17d51456d3b2bd4e2853e9a1af242348eb8bd0f6f 0001-nfsd-include-libgen.h-for-basename.patch 11ea62d8b2c5c9ea050ddd04c43cbe7169c097f2ba1402dff0b5340d88e7a972 0002-Fix-header-include-for-definition-of-NULL.patch d0d76cbe0a7929019b29690e2a43bada5f51a18bb4db9172212969c32dfefd38 0003-replace-__attribute_malloc__-with-the-more-portable-.patch 0a4099ec1c38ed19b3f9fe9c6c068b16aeff37294287ddc0ea637e8bd58af718 0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch @@ -152,6 +155,7 @@ cf0272e42310b1ff8d40ff37dc839df2dd4fba4cb408f8fa67ce445e2975b37cafbb35e6d41af2bb 1711803f848f73fef9fa74bd572fa7643c586f06eeedf62ed91bd2aa06ad59c7b1f1c585b6f7b7a8ce67ff7fd6b601d88dc99ca1000dd1d3f5991f420da9761b nfs.confd 70f96bb3a465ee0fa857a6e511051ca3ced9f5a5d1e6b8b32eec843a2067f2475d8979c724a3661de0a2b078eef143f55d75ed184d823841d9de5038da91fb91 nfs.exports 1b59dcb7f7a11a0cd8ee4ab25f22f85a57a3e8fd5fb54eb6add1a4933b5a96d333b3bff3955d36999a1f9b0b312b52c83e4efc5ed0cdecbd305a95e676129f6d 0001-conffile-use-standard-uint-_t-and-unsigned-char.patch +c56578c5b8c5f359471b69ffda4300e1aace9c1cf9687abae121f16f22542127252bcd62ae3b749377406de96c22fc0f5b4aebe056e0240470da25cf6f89eb0c 0001-nfsd-include-libgen.h-for-basename.patch 18f5c50ace27d88984b85b0fa529257ba151ec2295af8f66b3637b32df817063426ab56d1c9eca4b6437614338ff74865cd918c12695927b4da6af6b639dd0ed 0002-Fix-header-include-for-definition-of-NULL.patch bdef9397da387b51b9774e21c92b0850c082d6b250bfbecc680e5b22cd8fb7f14fea7e4f4febeefbd56494bfe4e56f585880664d6413b0f1290eac06d5b7712f 0003-replace-__attribute_malloc__-with-the-more-portable-.patch 495642168b11a642581dd574b2f0530a5bf7b6c5e89fae4926d8427afc6bb01e5170d9348207d3b97af7d70b795ebf208fb04a41636556d9ca66c0cee1554962 0004-Allow-usage-of-getrpcbynumber-when-getrpcbynumber_r-.patch |