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