Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 097a12bbe051ea2436c51f094f5d588b > files > 34

glibc-2.8-1.20080520.5.3mnb2.src.rpm

--- glibc-2.7/crypt/Makefile.orig	2007-09-19 14:37:33.000000000 -0600
+++ glibc-2.7/crypt/Makefile	2008-05-01 16:16:31.000000000 -0600
@@ -21,13 +21,13 @@
 #
 subdir	:= crypt
 
-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 md5 sha256-crypt sha256 \
-		     sha512-crypt sha512 crypt crypt_util
+		     sha512-crypt sha512 crypt crypt_util crypt_blowfish x86 crypt_gensalt wrapper
 
 tests := cert md5test md5c-test sha256test sha256c-test sha512test sha512c-test
 
diff -urpN glibc-2.3.2.orig/crypt/Versions glibc-2.3.2/crypt/Versions
--- glibc-2.3.2.orig/crypt/Versions	Sat Mar  4 00:47:30 2000
+++ glibc-2.3.2/crypt/Versions	Fri Feb 27 00:25:15 2004
@@ -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;
   }
 }
diff -urpN glibc-2.3.2.orig/crypt/crypt-entry.c glibc-2.3.2/crypt/crypt-entry.c
--- glibc-2.3.2.orig/crypt/crypt-entry.c	Sat Jul  7 19:20:51 2001
+++ glibc-2.3.2/crypt/crypt-entry.c	Fri Feb 27 00:12:32 2004
@@ -70,7 +70,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;
@@ -115,6 +115,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 *
@@ -130,6 +131,7 @@ crypt (key, salt)
 
   return __crypt_r (key, salt, &_ufc_foobar);
 }
+#endif
 
 
 /*