diff options
| author | Michael Hanson <hansonorders@verizon.net> | 2011-08-04 19:46:05 (GMT) |
|---|---|---|
| committer | Michael Hanson <hansonorders@verizon.net> | 2011-08-04 19:46:05 (GMT) |
| commit | d4fbf9a06beafc36c5862362113d8f3d169bb756 (patch) | |
| tree | 3461f41b33a06b3da79f73860674e4aa8430af5f /abs/core/util-linux-ng/fix-findmnt.patch | |
| parent | 85fb50abe2018af71bbc65ded247e781f2ad75ff (diff) | |
| parent | bb07edb449b1c718b49ec6fb98a7453cf8387b95 (diff) | |
| download | linhes_pkgbuild-d4fbf9a06beafc36c5862362113d8f3d169bb756.zip linhes_pkgbuild-d4fbf9a06beafc36c5862362113d8f3d169bb756.tar.gz linhes_pkgbuild-d4fbf9a06beafc36c5862362113d8f3d169bb756.tar.bz2 | |
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/util-linux-ng/fix-findmnt.patch')
| -rw-r--r-- | abs/core/util-linux-ng/fix-findmnt.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/abs/core/util-linux-ng/fix-findmnt.patch b/abs/core/util-linux-ng/fix-findmnt.patch deleted file mode 100644 index bf6574c..0000000 --- a/abs/core/util-linux-ng/fix-findmnt.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 -Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> -Date: Sun Jul 4 20:02:57 2010 +0200 - - libmount: fix merge_optstr (do not truncate 3 trailing characters) - - I believe this is the correct fix. - - Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> - -diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c -index 5dbcfa6..680e1fc 100644 ---- a/shlibs/mount/src/tab_parse.c -+++ b/shlibs/mount/src/tab_parse.c -@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) - if (!strcmp(vfs, fs)) - return strdup(vfs); /* e.g. "aaa" and "aaa" */ - -- sz = strlen(vfs) + strlen(fs) + 2; -+ /* leave space for leading "r[ow],", "," and trailing zero */ -+ sz = strlen(vfs) + strlen(fs) + 5; - res = malloc(sz); - if (!res) - return NULL; |