[Groonga-commit] groonga/groonga at 17583aa [master] Revert "nginx: fix build error on rawhide"

Back to archive index

Kentaro Hayashi null+****@clear*****
Thu Jan 25 18:44:05 JST 2018


Kentaro Hayashi	2018-01-25 18:44:05 +0900 (Thu, 25 Jan 2018)

  New Revision: 17583aa262d37bbe844bccf558a9b29aecf72a58
  https://github.com/groonga/groonga/commit/17583aa262d37bbe844bccf558a9b29aecf72a58

  Message:
    Revert "nginx: fix build error on rawhide"
    
    This reverts commit 7cad3769db1f9d9ed6ae9f05c6ebf1c6f93ab45f.
    
    It should not be commited into master.
    I've prepared a patch for Fedora rawhide, but fogot to reset...

  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 (+2 -3)
===================================================================
--- vendor/nginx-1.13.8/src/os/unix/ngx_user.c    2018-01-25 18:41:44 +0900 (23a070147)
+++ vendor/nginx-1.13.8/src/os/unix/ngx_user.c    2018-01-25 18:44:05 +0900 (7ebe2b576)
@@ -21,9 +21,8 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
     struct crypt_data   cd;
 
     cd.initialized = 0;
-#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 */
+#ifdef __GLIBC__
+    /* work around the glibc bug */
     cd.current_salt[0] = ~salt[0];
 #endif
 
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180125/9902e6e2/attachment.htm 



More information about the Groonga-commit mailing list
Back to archive index