Kentaro Hayashi
null+****@clear*****
Mon Jan 22 16:30:05 JST 2018
Kentaro Hayashi 2018-01-22 16:30:05 +0900 (Mon, 22 Jan 2018) New Revision: 7cad3769db1f9d9ed6ae9f05c6ebf1c6f93ab45f https://github.com/groonga/groonga/commit/7cad3769db1f9d9ed6ae9f05c6ebf1c6f93ab45f Message: nginx: fix build error on rawhide Since crypt library is switched into libxcrypt on Fedora 28 (instead of glibc with libcrypt), it turned out that FTBFS occurs. It seems that workaround code causes it. The bug itself was already fixed in glibc 2.3.2, so there is no need to use that workaround anymore. Modified files: vendor/nginx-1.13.8/src/os/unix/ngx_user.c Modified: vendor/nginx-1.13.8/src/os/unix/ngx_user.c (+3 -2) =================================================================== --- vendor/nginx-1.13.8/src/os/unix/ngx_user.c 2018-01-25 16:26:41 +0900 (7ebe2b576) +++ vendor/nginx-1.13.8/src/os/unix/ngx_user.c 2018-01-22 16:30:05 +0900 (23a070147) @@ -21,8 +21,9 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) struct crypt_data cd; cd.initialized = 0; -#ifdef __GLIBC__ - /* work around the glibc bug */ +#if __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3 + /* work around the glibc bug, it was fixed in 2.3.2. + see https://www.ruby-forum.com/topic/4412553 */ cd.current_salt[0] = ~salt[0]; #endif -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180122/ca08d2f8/attachment-0001.htm
