SOURCES: glibc-crypt-blowfish.patch, glibc-info.patch, glibc-missi...
arekm
arekm at pld-linux.org
Fri Oct 19 00:07:14 CEST 2007
Author: arekm Date: Thu Oct 18 22:07:14 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
glibc-crypt-blowfish.patch (1.2 -> 1.3) , glibc-info.patch (1.3 -> 1.4) , glibc-missing-nls.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/glibc-crypt-blowfish.patch
diff -u SOURCES/glibc-crypt-blowfish.patch:1.2 SOURCES/glibc-crypt-blowfish.patch:1.3
--- SOURCES/glibc-crypt-blowfish.patch:1.2 Thu Nov 9 21:56:25 2000
+++ SOURCES/glibc-crypt-blowfish.patch Fri Oct 19 00:07:09 2007
@@ -1,14 +1,14 @@
diff -urN glibc-2.1.91.orig/crypt/Makefile glibc-2.1.91/crypt/Makefile
--- glibc-2.1.91.orig/crypt/Makefile Wed Jun 14 05:49:02 2000
+++ glibc-2.1.91/crypt/Makefile Sat Jul 15 00:58:39 2000
-@@ -28,7 +28,7 @@
- extra-libs := libcrypt
+@@ -27,7 +27,7 @@
extra-libs-others := $(extra-libs)
--libcrypt-routines := crypt-entry md5-crypt md5 crypt crypt_util
-+libcrypt-routines := crypt-entry md5-crypt md5 arc4random bcrypt blowfish crypt crypt_util
+ libcrypt-routines := crypt-entry md5-crypt md5 sha256-crypt sha256 \
+- sha512-crypt sha512 crypt crypt_util
++ sha512-crypt sha512 arc4random bcrypt blowfish crypt crypt_util
- tests = cert md5test md5c-test
+ tests := cert md5test md5c-test sha256test sha256c-test sha512test sha512c-test
diff -urN glibc-2.1.91.orig/crypt/arc4random.c glibc-2.1.91/crypt/arc4random.c
--- glibc-2.1.91.orig/crypt/arc4random.c Thu Jan 1 01:00:00 1970
@@ -1447,10 +1447,10 @@
/* For use by the old, non-reentrant routines (crypt/encrypt/setkey) */
extern struct crypt_data _ufc_foobar;
-@@ -84,6 +87,10 @@
- if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
- return __md5_crypt_r (key, salt, (char *) data,
- sizeof (struct crypt_data));
+@@ -109,6 +109,10 @@
+ if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
+ return __sha512_crypt_r (key, salt, (char *) data,
+ sizeof (struct crypt_data));
+
+ /* Try to find out whether we have to use Blowfish encryption replacement. */
+ if (strncmp (blowfish_salt_prefix, salt, sizeof (blowfish_salt_prefix) - 1) == 0)
@@ -1458,12 +1458,14 @@
#endif
/*
-@@ -126,6 +133,8 @@
- /* Try to find out whether we have to use MD5 encryption replacement. */
- if (strncmp (md5_salt_prefix, salt, sizeof (md5_salt_prefix) - 1) == 0)
- return __md5_crypt (key, salt);
+@@ -159,6 +163,9 @@
+ /* Try to find out whether we have to use SHA512 encryption replacement. */
+ if (strncmp (sha512_salt_prefix, salt, sizeof (sha512_salt_prefix) - 1) == 0)
+ return __sha512_crypt (key, salt);
++
+ if (strncmp (blowfish_salt_prefix, salt, sizeof (blowfish_salt_prefix) - 1) == 0)
+ return bcrypt (key, salt);
#endif
return __crypt_r (key, salt, &_ufc_foobar);
+
================================================================
Index: SOURCES/glibc-info.patch
diff -u SOURCES/glibc-info.patch:1.3 SOURCES/glibc-info.patch:1.4
--- SOURCES/glibc-info.patch:1.3 Fri Sep 17 13:17:12 1999
+++ SOURCES/glibc-info.patch Fri Oct 19 00:07:09 2007
@@ -2,14 +2,15 @@
--- glibc-2.1/manual/libc.texinfo Tue Jan 12 18:22:16 1999
+++ glibc-2.1.new/manual/libc.texinfo Sat Feb 27 02:40:12 1999
@@ -5,9 +5,9 @@
- @setchapternewpage odd
+ @c setchapternewpage odd
@comment Tell install-info what to do.
-- at dircategory GNU libraries
+- at dircategory Software libraries
+ at dircategory Libraries:
@direntry
-* Libc: (libc). C library.
-+* Libc: (libc). C library
++* Libc: (libc). C library.
@end direntry
+ @include dir-add.texi
- @c This tells texinfo.tex to use the real section titles in xrefs in
+
================================================================
Index: SOURCES/glibc-missing-nls.patch
diff -u SOURCES/glibc-missing-nls.patch:1.7 SOURCES/glibc-missing-nls.patch:1.8
--- SOURCES/glibc-missing-nls.patch:1.7 Mon Jul 3 13:51:59 2006
+++ SOURCES/glibc-missing-nls.patch Fri Oct 19 00:07:09 2007
@@ -95,15 +95,6 @@
#: argp/argp-parse.c:167
msgid "Print program version"
-@@ -98,7 +102,7 @@
- msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
- msgstr "%s%s%s:%u: %s%sWarunek zapewnienia `%s' nie zosta³ spe³niony.\n"
-
--#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:96 nss/makedb.c:61
-+#: argp/argp-parse.c:104 catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:96 nss/makedb.c:61
- msgid "NAME"
- msgstr "NAZWA"
-
@@ -4788,6 +4792,102 @@
msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
msgstr "\t%s [-n id_sieci]* [-o plik_wy] [plik_we]\n"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/glibc-crypt-blowfish.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/glibc-info.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/glibc-missing-nls.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list