CVS commit: pkgsrc/databases/mariadb55-client

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Sun Aug  5 15:59:26 UTC 2018

Modified Files:
        pkgsrc/databases/mariadb55-client: distinfo
Added Files:
        pkgsrc/databases/mariadb55-client/patches: patch-mysys_my_symlink.c

Log Message:
Fix server startup failure on NetBSD.

>From upstream https://github.com/MariaDB/server/pull/838


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mariadb55-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mariadb55-client/patches/patch-mysys_my_symlink.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mariadb55-client/distinfo
diff -u pkgsrc/databases/mariadb55-client/distinfo:1.8 pkgsrc/databases/mariadb55-client/distinfo:1.9
--- pkgsrc/databases/mariadb55-client/distinfo:1.8      Tue Aug  8 11:23:38 2017
+++ pkgsrc/databases/mariadb55-client/distinfo  Sun Aug  5 15:59:26 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2017/08/08 11:23:38 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2018/08/05 15:59:26 manu Exp $
 
 SHA1 (mariadb-5.5.57.tar.gz) = 2e2d48179b770940f053bb37c72c7ea42aea46ca
 RMD160 (mariadb-5.5.57.tar.gz) = 332179a8f94eb6d467021b2095d1c004cb7dc5b0
@@ -29,6 +29,7 @@ SHA1 (patch-include_myisam.h) = 4cc8fd0b
 SHA1 (patch-include_violite.h) = 31555632c2f48ae2cf9670f94a8233bfcad25083
 SHA1 (patch-libmysql_CMakeLists.txt) = bca5243b76ea783e5b39e619528b28095aa1392a
 SHA1 (patch-mysys_my__getopt.c) = 76ed2ffb774a7171bb547b3098db148329cbe21d
+SHA1 (patch-mysys_my_symlink.c) = d88553afa2ca97370d307092fedf6c8c53f63b02
 SHA1 (patch-mysys_stacktrace.c) = 9f18875126208c30d41f896f0e6edc7000df0c73
 SHA1 (patch-plugin_handler__socket_libhsclient_socket.cpp) = 4fe680a207162c750ca4a6107bfbaa912e93d5d0
 SHA1 (patch-scripts_CMakeLists.txt) = 5e30442df51009fd253b0f3c99526b587b2626ff

Added files:

Index: pkgsrc/databases/mariadb55-client/patches/patch-mysys_my_symlink.c
diff -u /dev/null pkgsrc/databases/mariadb55-client/patches/patch-mysys_my_symlink.c:1.1
--- /dev/null   Sun Aug  5 15:59:26 2018
+++ pkgsrc/databases/mariadb55-client/patches/patch-mysys_my_symlink.c  Sun Aug  5 15:59:26 2018
@@ -0,0 +1,31 @@
+$NetBSD: patch-mysys_my_symlink.c,v 1.1 2018/08/05 15:59:26 manu Exp $
+
+Fix server startup failure on NetBSD. From upstream
+https://github.com/MariaDB/server/pull/838
+
+--- mysys/my_symlink.c.orig    2018-08-05 09:34:34.048086306 +0000
++++ mysys/my_symlink.c 2018-08-05 12:19:23.894217529 +0000
+@@ -235,9 +236,22 @@
+       *pdfd= dfd;
+       return pathname + (s - buf);
+     }
+ 
+-    fd = openat(dfd, s, O_NOFOLLOW | O_PATH);
++    /*
++     * Linux accepts dfd = -1 for root, but this is not a standard
++     * behavior documented by OpenGroup XSH
++     * http://pubs.opengroup.org/onlinepubs/9699919799/functions/open.html
++     * At least on NetBSD, calling openat() with dfd = -1 fails with EBADF.
++     * Since s has been tested to be an absolute parth, just use open()
++     * on non Linux systems for the same result.
++     */
++#ifndef linux
++    if (dfd == -1)
++      fd = open(s, O_NOFOLLOW | O_PATH);
++    else
++#endif
++      fd = openat(dfd, s, O_NOFOLLOW | O_PATH);
+     if (fd < 0)
+       goto err;
+ 
+     if (dfd >= 0)