Hello community, here is the log from the commit of package libxcrypt for openSUSE:Factory checked in at Wed Aug 24 14:42:51 CEST 2011.
-------- --- libxcrypt/libxcrypt.changes 2011-07-27 12:02:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxcrypt/libxcrypt.changes 2011-08-24 10:33:48.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 24 07:45:25 UTC 2011 - [email protected] + +- fix prefix detection (bnc#713727) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxcrypt.spec ++++++ --- /var/tmp/diff_new_pack.yollOL/_old 2011-08-24 14:41:05.000000000 +0200 +++ /var/tmp/diff_new_pack.yollOL/_new 2011-08-24 14:41:05.000000000 +0200 @@ -27,7 +27,7 @@ Obsoletes: libxcrypt-64bit %endif Version: 3.0.4 -Release: 7 +Release: 9 Summary: Crypt Library for DES, MD5, Blowfish and others Source: libxcrypt-%{version}.tar.bz2 Url: http://www.openwall.com/crypt/ @@ -70,11 +70,11 @@ %prep %setup -q -a1 +%patch0 -p1 +%patch1 -p0 +%patch2 -p0 cp crypt_blowfish-*/*.{c,h} plugins/blowfish mv plugins/blowfish/wrapper.c plugins/blowfish/blowfish-test.c -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build rm -f libtool ++++++ libxcrypt-3.0.4-blowfish-noasm.diff ++++++ --- /var/tmp/diff_new_pack.yollOL/_old 2011-08-24 14:41:05.000000000 +0200 +++ /var/tmp/diff_new_pack.yollOL/_new 2011-08-24 14:41:05.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libxcrypt-3.0.4/plugins/blowfish/crypt_blowfish.c +Index: crypt_blowfish-1.2/crypt_blowfish.c =================================================================== ---- libxcrypt-3.0.4.orig/plugins/blowfish/crypt_blowfish.c -+++ libxcrypt-3.0.4/plugins/blowfish/crypt_blowfish.c -@@ -42,7 +42,7 @@ +--- crypt_blowfish-1.2/crypt_blowfish.c.orig ++++ crypt_blowfish-1.2/crypt_blowfish.c +@@ -54,7 +54,7 @@ #include "crypt_blowfish.h" #ifdef __i386__ ++++++ libxcrypt-3.0.4-blowfish-xcrypt.diff ++++++ --- /var/tmp/diff_new_pack.yollOL/_old 2011-08-24 14:41:05.000000000 +0200 +++ /var/tmp/diff_new_pack.yollOL/_new 2011-08-24 14:41:05.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libxcrypt-3.0.4/plugins/blowfish/crypt_blowfish.c +Index: crypt_blowfish-1.2/crypt_blowfish.c =================================================================== ---- libxcrypt-3.0.4.orig/plugins/blowfish/crypt_blowfish.c -+++ libxcrypt-3.0.4/plugins/blowfish/crypt_blowfish.c -@@ -32,6 +32,7 @@ +--- crypt_blowfish-1.2/crypt_blowfish.c.orig ++++ crypt_blowfish-1.2/crypt_blowfish.c +@@ -44,6 +44,7 @@ */ #include <string.h> @@ -10,7 +10,7 @@ #include <errno.h> #ifndef __set_errno -@@ -52,6 +53,10 @@ +@@ -64,6 +65,10 @@ #define BF_SCALE 0 #endif @@ -21,7 +21,7 @@ typedef unsigned int BF_word; typedef signed int BF_word_signed; -@@ -887,3 +892,23 @@ char *_crypt_gensalt_blowfish_rn(const c +@@ -900,3 +905,23 @@ char *_crypt_gensalt_blowfish_rn(const c return output; } @@ -45,11 +45,11 @@ +{ + return _crypt_gensalt_blowfish_rn(_find_prefix("$2a$"), count, input, size, output, output_size); +} -Index: libxcrypt-3.0.4/plugins/blowfish/blowfish-test.c +Index: crypt_blowfish-1.2/wrapper.c =================================================================== ---- libxcrypt-3.0.4.orig/plugins/blowfish/blowfish-test.c -+++ libxcrypt-3.0.4/plugins/blowfish/blowfish-test.c -@@ -26,13 +26,19 @@ +--- crypt_blowfish-1.2/wrapper.c.orig ++++ crypt_blowfish-1.2/wrapper.c +@@ -37,13 +37,19 @@ #define CRYPT_OUTPUT_SIZE (7 + 22 + 31 + 1) #define CRYPT_GENSALT_OUTPUT_SIZE (7 + 22 + 1) @@ -71,7 +71,7 @@ #if defined(__GLIBC__) && defined(_LIBC) /* crypt.h from glibc-crypt-2.1 will define struct crypt_data for us */ -@@ -186,6 +192,7 @@ char *crypt(const char *key, const char +@@ -197,6 +203,7 @@ char *crypt(const char *key, const char #define __crypt_gensalt crypt_gensalt #endif @@ -79,7 +79,7 @@ char *__crypt_gensalt_rn(const char *prefix, unsigned long count, const char *input, int size, char *output, int output_size) { -@@ -220,6 +227,13 @@ char *__crypt_gensalt_rn(const char *pre +@@ -231,6 +238,13 @@ char *__crypt_gensalt_rn(const char *pre return use(prefix, count, input, size, output, output_size); } @@ -93,7 +93,7 @@ char *__crypt_gensalt_ra(const char *prefix, unsigned long count, const char *input, int size) -@@ -531,4 +545,21 @@ int main(void) +@@ -542,4 +556,21 @@ int main(void) return 0; } @@ -115,11 +115,11 @@ + return 0; +} #endif -Index: libxcrypt-3.0.4/plugins/blowfish/Makefile.am +Index: plugins/blowfish/Makefile.am =================================================================== ---- libxcrypt-3.0.4.orig/plugins/blowfish/Makefile.am -+++ libxcrypt-3.0.4/plugins/blowfish/Makefile.am -@@ -25,5 +25,9 @@ libxcrypt_2a_la_SOURCES = crypt_blowfish +--- plugins/blowfish/Makefile.am.orig ++++ plugins/blowfish/Makefile.am +@@ -25,5 +25,11 @@ libxcrypt_2a_la_SOURCES = crypt_blowfish noinst_PROGRAMS = blowfish-test @@ -129,5 +129,7 @@ +blowfish_test_LDADD = libxcrypt_2a.la -ldl -lpthread + +install-data-local: -+ $(LN_S) libxcrypt_2a.so.1 $(DESTDIR)$(plugindir)/libxcrypt_2x.so.1 -+ $(LN_S) libxcrypt_2a.so.1 $(DESTDIR)$(plugindir)/libxcrypt_2y.so.1 ++ @for i in x y; do \ ++ cp .libs/libxcrypt_2a.so.1.0.0 $(DESTDIR)$(plugindir)/libxcrypt_2$$i.so.1.0.0; \ ++ $(LN_S) libxcrypt_2$$i.so.1.0.0 $(DESTDIR)$(plugindir)/libxcrypt_2$$i.so.1; \ ++ done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
