diff options
Diffstat (limited to 'net-misc/openssh/files/openssh-8.0_p1-tests.patch')
| -rw-r--r-- | net-misc/openssh/files/openssh-8.0_p1-tests.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/net-misc/openssh/files/openssh-8.0_p1-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-tests.patch deleted file mode 100644 index 6b2ae489d0e8..000000000000 --- a/net-misc/openssh/files/openssh-8.0_p1-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/openbsd-compat/regress/utimensattest.c b/openbsd-compat/regress/utimensattest.c -index a7bc7634..46f79db2 100644 ---- a/openbsd-compat/regress/utimensattest.c -+++ b/openbsd-compat/regress/utimensattest.c -@@ -23,6 +23,7 @@ - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -+#include <time.h> - - #define TMPFILE "utimensat.tmp" - #define TMPFILE2 "utimensat.tmp2" -@@ -88,8 +89,30 @@ main(void) - if (symlink(TMPFILE2, TMPFILE) == -1) - fail("symlink", 0, 0); - -+#ifdef __linux__ -+ /* -+ * The semantics of the original test are wrong on Linux -+ * From the man page for utimensat(): -+ * AT_SYMLINK_NOFOLLOW -+ * If pathname specifies a symbolic link, then update the -+ * timestamps of the link, rather than the file to which it refers. -+ * -+ * So the call will succeed, and update the times on the symlink. -+ */ -+ if (utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW) != -1) { -+ if (fstatat(AT_FDCWD, TMPFILE, &sb, 0) == -1) -+ fail("could not follow and stat symlink", 0, 0); -+ -+ if (sb.st_atim.tv_sec == ts[0].tv_sec -+ && sb.st_atim.tv_nsec == ts[0].tv_nsec -+ && sb.st_mtim.tv_nsec == ts[1].tv_sec -+ && sb.st_mtim.tv_nsec == ts[1].tv_nsec) -+ fail("utimensat followed symlink", 0, 0); -+ } -+#else /* __linux__ */ - if (utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW) != -1) - fail("utimensat followed symlink", 0, 0); -+#endif /* __linux__ */ - - if (!(unlink(TMPFILE) == 0 && unlink(TMPFILE2) == 0)) - fail("unlink", 0, 0); |