head 1.2; access; symbols OPENPKG_E1_MP:1.2 OPENPKG_E1_MP_HEAD:1.2; locks; strict; comment @# @; 1.2 date 2006.12.07.07.39.15; author rse; state Exp; branches; next 1.1; commitid 2QZLqjG9QwckXyXr; 1.1 date 2006.12.06.09.35.49; author rse; state Exp; branches; next ; commitid LQWqxySDbdbjDrXr; desc @@ 1.2 log @upgrade to 0.9.5 (upstream author has taken over our contributed patch -- at least partly) @ text @Index: configure --- configure.orig 2006-12-05 21:49:30 +0100 +++ configure 2006-12-06 10:23:57 +0100 @@@@ -84,7 +84,7 @@@@ fi echo $ECHO_N "checking to see if $PREFIX/bin/md5sum is Microbrew... $ECHO_C" -if [ -x $PREFIX/bin/md5sum ]; then +if false; then $PREFIX/bin/md5sum --version | grep "Microbrew" > /dev/null 2>&1 if [ $? != 0 ]; then echo "no (will not overwrite)" @@@@ -99,7 +99,7 @@@@ fi echo $ECHO_N "checking to see if $PREFIX/bin/sha1sum is Microbrew... $ECHO_C" -if [ -x $PREFIX/bin/sha1sum ]; then +if false; then $PREFIX/bin/sha1sum --version | grep "Microbrew" > /dev/null 2>&1 if [ $? != 0 ]; then echo "no (will not overwrite)" @@@@ -114,7 +114,7 @@@@ fi echo $ECHO_N "checking to see if $PREFIX/bin/ripemd160sum is Microbrew... $ECHO_C" -if [ -x $PREFIX/bin/ripemd160sum ]; then +if false; then $PREFIX/bin/ripemd160sum --version | grep "Microbrew" > /dev/null 2>&1 if [ $? != 0 ]; then echo "no (will not overwrite)" Index: md5sum.c --- md5sum.c.orig 2006-12-05 21:49:30 +0100 +++ md5sum.c 2006-12-06 10:27:54 +0100 @@@@ -30,10 +30,11 @@@@ **********************************************************************/ +#include +#include #include #include #include -#include #include #include "parseopts.h" @ 1.1 log @new package: md5sha1sum 0.9.4 (MD5/SHA1/RIPEMD160 File Checksum Utilities) @ text @a46 15 @@@@ -161,11 +162,11 @@@@ wrong */ hashsize = strlen(opts->hashes[i]); - if(strstr(argv[0], "sha1sum") && (hashsize != 40)) + if(strstr(argv[0], "sha1sum") && (hashsize != (SHA_DIGEST_LENGTH * 2))) fputs("Warning: Hash size is wrong, maybe you want to use 'md5sum'\n", stderr); - if(strstr(argv[0], "ripemd160sum") && (hashsize != 40)) + if(strstr(argv[0], "ripemd160sum") && (hashsize != (RIPEMD160_DIGEST_LENGTH * 2))) fputs("Warning: Hash size is wrong, maybe you want to use 'md5sum'\n", stderr); - if(!strstr(argv[0], "md5sum") && hashsize != 32) + if(strstr(argv[0], "md5sum") && (hashsize != (MD5_DIGEST_LENGTH * 2))) fputs("Warning: Hash size is wrong, maybe you want to use 'sha1sum' or 'ripemd160sum'\n", stderr); if(opts->vmode == VMODE_SILENT) { @