This commit is contained in:
Mario Fetka
2013-12-05 14:14:35 +01:00
parent 0f616d4921
commit ecef5085a5
33 changed files with 665 additions and 0 deletions

View File

@@ -0,0 +1,40 @@
diff -urN libxcrypt-3.0.2/src/crypt_util.c libxcrypt-3.0.2.new/src/crypt_util.c
--- libxcrypt-3.0.2/src/crypt_util.c 2007-10-25 15:17:46.000000000 +0200
+++ libxcrypt-3.0.2.new/src/crypt_util.c 2013-02-04 12:45:20.560191479 +0100
@@ -30,8 +30,7 @@
#endif
#include <string.h>
-#include <bits/libc-lock.h>
-#define __libc_lock_t pthread_mutex_t
+#include <pthread.h>
#ifndef STATIC
#define STATIC static
@@ -265,7 +264,7 @@
*/
struct crypt_data _ufc_foobar;
-__libc_lock_define_initialized (static, _ufc_tables_lock)
+static pthread_mutex_t _ufc_tables_lock = PTHREAD_MUTEX_INITIALIZER;
#ifdef DEBUG
@@ -362,7 +361,7 @@
#endif
if(small_tables_initialized == 0) {
- __libc_lock_lock (_ufc_tables_lock);
+ pthread_mutex_lock (&_ufc_tables_lock);
if(small_tables_initialized)
goto small_tables_done;
@@ -471,7 +470,7 @@
}
small_tables_initialized = 1;
small_tables_done:
- __libc_lock_unlock(_ufc_tables_lock);
+ pthread_mutex_unlock (&_ufc_tables_lock);
}
/*

View File

@@ -0,0 +1,12 @@
diff -dur libxcrypt-3.0.2.orig/configure.in libxcrypt-3.0.2/configure.in
--- libxcrypt-3.0.2.orig/configure.in 2008-07-16 14:30:29.000000000 +0200
+++ libxcrypt-3.0.2/configure.in 2012-06-19 12:27:48.000000000 +0200
@@ -29,7 +29,7 @@
EXTRA_CFLAGS=""
if eval "test x$GCC = xyes"; then
- EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Wpointer-arith -Werror"
+ EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef -Wpointer-arith"
fi
AC_SUBST(EXTRA_CFLAGS)