Sophie

Sophie

distrib > Mageia > 6 > armv5tl > by-pkgid > 741d673bcb95c5664e7c2a84750d540a > files > 125

glibc-2.22-26.mga6.src.rpm

diff -Nurp glibc-2.22.orig/crypt/crypt-entry.c glibc-2.22/crypt/crypt-entry.c
--- glibc-2.22.orig/crypt/crypt-entry.c	2015-08-05 09:42:21.000000000 +0300
+++ glibc-2.22/crypt/crypt-entry.c	2015-08-15 23:50:24.667954088 +0300
@@ -71,7 +71,7 @@ extern struct crypt_data _ufc_foobar;
  */
 
 char *
-__crypt_r (key, salt, data)
+__des_crypt_r (key, salt, data)
      const char *key;
      const char *salt;
      struct crypt_data * __restrict data;
@@ -145,6 +145,7 @@ __crypt_r (key, salt, data)
   _ufc_output_conversion_r (res[0], res[1], salt, data);
   return data->crypt_3_buf;
 }
+#if 0
 weak_alias (__crypt_r, crypt_r)
 
 char *
@@ -170,6 +171,7 @@ crypt (key, salt)
 
   return __crypt_r (key, salt, &_ufc_foobar);
 }
+#endif
 
 
 /*
diff -Nurp glibc-2.22.orig/crypt/crypt-private.h glibc-2.22/crypt/crypt-private.h
--- glibc-2.22.orig/crypt/crypt-private.h	2015-08-05 09:42:21.000000000 +0300
+++ glibc-2.22/crypt/crypt-private.h	2015-08-15 23:50:47.760130516 +0300
@@ -65,7 +65,7 @@ extern void __encrypt_r (char * __restri
 			      struct crypt_data * __restrict __data);
 
 /* crypt-entry.c */
-extern char *__crypt_r (const char *__key, const char *__salt,
+extern char *__des_crypt_r (const char *__key, const char *__salt,
 			     struct crypt_data * __restrict __data);
 extern char *fcrypt (const char *key, const char *salt);
 
diff -Nurp glibc-2.22.orig/crypt/Makefile glibc-2.22/crypt/Makefile
--- glibc-2.22.orig/crypt/Makefile	2015-08-05 09:42:21.000000000 +0300
+++ glibc-2.22/crypt/Makefile	2015-08-15 23:50:24.668954096 +0300
@@ -22,13 +22,13 @@ subdir	:= crypt
 
 include ../Makeconfig
 
-headers := crypt.h
+headers := crypt.h gnu-crypt.h ow-crypt.h
 
 extra-libs := libcrypt
 extra-libs-others := $(extra-libs)
 
 libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
-		     crypt_util
+		     crypt_util crypt_blowfish x86 crypt_gensalt wrapper
 
 tests := cert md5c-test sha256c-test sha512c-test badsalttest
 
diff -Nurp glibc-2.22.orig/crypt/Versions glibc-2.22/crypt/Versions
--- glibc-2.22.orig/crypt/Versions	2015-08-05 09:42:21.000000000 +0300
+++ glibc-2.22/crypt/Versions	2015-08-15 23:50:24.668954096 +0300
@@ -1,5 +1,6 @@
 libcrypt {
   GLIBC_2.0 {
     crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r;
+    crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
   }
 }