OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.3 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../musl/pkg/nginx/nginx-musl-remove-glibc-crypt-workaround.patch
  5. # Copyright (C) 2014 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Remove glibc specific workaround when building with musl libc
  17. patch origin: sabotage linux (https://github.com/sabotage-linux/sabotage)
  18. diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c
  19. index 7a71203..937839b 100644
  20. --- a/src/os/unix/ngx_user.c
  21. +++ b/src/os/unix/ngx_user.c
  22. @@ -31,8 +31,6 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
  23. struct crypt_data cd;
  24. cd.initialized = 0;
  25. - /* work around the glibc bug */
  26. - cd.current_salt[0] = ~salt[0];
  27. value = crypt_r((char *) key, (char *) salt, &cd);