diff options
| author | James Meyer <james.meyer@operamail.com> | 2011-08-06 01:13:55 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2011-08-06 01:13:55 (GMT) |
| commit | 12d025b342ea99681a2b9d830a153ced182daca1 (patch) | |
| tree | d9943ed95e570c0706c6b5021b4570894877325a /abs/core/util-linux-ng/fix-findmnt.patch | |
| parent | bcfb3dc1bd231f91914f917149164d41a2f3ce0a (diff) | |
| parent | 9cc464bde03a97d6cbea14420b1b2ee32ca3ca00 (diff) | |
| download | linhes_pkgbuild-12d025b342ea99681a2b9d830a153ced182daca1.zip linhes_pkgbuild-12d025b342ea99681a2b9d830a153ced182daca1.tar.gz linhes_pkgbuild-12d025b342ea99681a2b9d830a153ced182daca1.tar.bz2 | |
Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/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; |