diff options
Diffstat (limited to 'sys-apps/pmount/files')
6 files changed, 142 insertions, 5 deletions
diff --git a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch index 93d0555f0f3d..319a1d6f04a3 100644 --- a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch +++ b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch @@ -16,21 +16,21 @@ diff --git a/tests/check_fstab/a b/tests/check_fstab/a new file mode 100644 index 0000000..d16d1c5 --- /dev/null -+++ tests/check_fstab/a ++++ b/tests/check_fstab/a @@ -0,0 +1 @@ +This file is a 'dummy device file' for the fstab check diff --git a/tests/check_fstab/d b/tests/check_fstab/d new file mode 100644 index 0000000..d16d1c5 --- /dev/null -+++ tests/check_fstab/d ++++ b/tests/check_fstab/d @@ -0,0 +1 @@ +This file is a 'dummy device file' for the fstab check diff --git a/tests/check_fstab/fstab b/tests/check_fstab/fstab new file mode 100644 index 0000000..8ba6f6c --- /dev/null -+++ tests/check_fstab/fstab ++++ b/tests/check_fstab/fstab @@ -0,0 +1,6 @@ +# A dummy fstab file for + diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-exfat-support.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-exfat-support.patch new file mode 100644 index 000000000000..b5f1074e24bc --- /dev/null +++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-exfat-support.patch @@ -0,0 +1,12 @@ +diff --git a/src/fs.c b/src/fs.c +index 65ea0c7..2a12b60 100644 +--- a/src/fs.c ++++ b/src/fs.c +@@ -21,6 +21,7 @@ + static struct FS supported_fs[] = { + { "udf", "nosuid,nodev,user", 1, "000", ",iocharset=%s" }, + { "iso9660", "nosuid,nodev,user", 1, NULL, ",iocharset=%s" }, ++ { "exfat", "nosuid,nodev,user", 1, "077"}, + { "vfat", "nosuid,nodev,user,quiet,shortname=mixed", 1, "077", + ",iocharset=%s",",fmask=%04o,dmask=%04o"}, + { "hfsplus", "nosuid,nodev,user", 1, NULL, 0 }, diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-fix-buggy-realpath-implementation.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-fix-buggy-realpath-implementation.patch new file mode 100644 index 000000000000..f1d7f7d4c0fc --- /dev/null +++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-fix-buggy-realpath-implementation.patch @@ -0,0 +1,31 @@ +Fix bug in realpath implementation bundled with pmount which caused it to +likely fail on paths with several symlinks. + +The issue was first noticed by failure in tests: +Gentoo-Bug: https://bugs.gentoo.org/741810 +--- pmount-0.9.99-alpha/src/realpath.c.orig 2024-01-21 09:19:55.776224329 +0300 ++++ pmount-0.9.99-alpha/src/realpath.c 2024-01-21 09:30:46.751233027 +0300 +@@ -128,6 +128,7 @@ + } else { + #ifdef resolve_symlinks /* Richard Gooch dislikes sl resolution */ + int m; ++ char *old_buf; + + /* Note: readlink doesn't add the null byte. */ + link_path[n] = '\0'; +@@ -141,12 +142,13 @@ + + /* Insert symlink contents into path. */ + m = strlen(path); +- if (buf) +- free(buf); ++ old_buf = buf; /* path might point to buf at this point */ + buf = xmalloc(m + n + 1); + memcpy(buf, link_path, n); + memcpy(buf + n, path, m + 1); + path = buf; ++ if (old_buf) ++ free(old_buf); + #endif + } + *npath++ = '/'; diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch new file mode 100644 index 000000000000..af6a1ebc521d --- /dev/null +++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-limits-musl.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/713422 +--- a/src/utils.c ++++ b/src/utils.c +@@ -25,6 +25,7 @@ + #include <libintl.h> + + #include <unistd.h> ++#include <limits.h> + + #include "utils.h" + + diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch index c96fc0554522..3dabd03c9659 100644 --- a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch +++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/416985 ---- src/conffile.c -+++ src/conffile.c +--- a/src/conffile.c ++++ b/src/conffile.c @@ -372,7 +372,7 @@ static int cf_prepare_regexps() /* A regexp matching a boolean value*/ diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch new file mode 100644 index 000000000000..cdcb65ad822d --- /dev/null +++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-missing-includes.patch @@ -0,0 +1,82 @@ +--- a/src/conffile.c ++++ b/src/conffile.c +@@ -22,6 +22,7 @@ + #include <sys/types.h> + #include <pwd.h> + #include <grp.h> ++#include <unistd.h> + + #include "conffile.h" + #include "config.h" +--- a/src/luks.c ++++ b/src/luks.c +@@ -13,7 +13,9 @@ + #include "utils.h" + #include "policy.h" + #include <stdio.h> ++#include <fcntl.h> + #include <limits.h> ++#include <unistd.h> + #include <sys/stat.h> + #include <libintl.h> + +--- a/src/policy.c ++++ b/src/policy.c +@@ -13,6 +13,7 @@ + #include "policy.h" + #include "utils.h" + ++#include <ctype.h> + #include <stdio.h> + #include <string.h> + #include <unistd.h> +--- a/src/pmount.c ++++ b/src/pmount.c +@@ -29,6 +29,7 @@ + #include "policy.h" + #include "utils.h" + #include "luks.h" ++#include "loop.h" + #include "config.h" + + /* Configuration file handling */ +--- a/src/policy.c ++++ b/src/policy.c +@@ -33,6 +33,7 @@ + #include <pwd.h> + #include <utmpx.h> + ++#include "configuration.h" + + /* We use our own safe version of realpath */ + #include "realpath.h" +--- a/src/pumount.c ++++ b/src/pumount.c +@@ -24,6 +24,7 @@ + #include "utils.h" + #include "luks.h" + #include "config.h" ++#include "configuration.h" + + /* error codes */ + const int E_ARGS = 1; +--- a/tests/test_policy.c ++++ b/tests/test_policy.c +@@ -16,6 +16,7 @@ + #include "policy.h" + #include "utils.h" + #include <stdio.h> ++#include <string.h> + + int testsFailed = 0; + int totalTests = 0; +--- a/tests/test_spawn.c ++++ b/tests/test_spawn.c +@@ -12,6 +12,7 @@ + + + #include <stdio.h> ++#include <string.h> + #include <unistd.h> + #include "utils.h" + |