2
0

Merge branch 'master' of github.com:Lyndir/MasterPassword

This commit is contained in:
Maarten Billemont 2014-10-23 20:10:44 -04:00
commit 15c53c06c6
3 changed files with 5 additions and 5 deletions

View File

@ -36,7 +36,7 @@ fi
### DEPENDENCIES ### DEPENDENCIES
digest() { digest() {
openssl sha1 -binary < "$1" | od -t x1 -An -v | tr -d '[:space:]' openssl sha -sha256 -binary < "$1" | od -t x1 -An -v | tr -d '[:space:]'
} }
fetch() { fetch() {
if hash wget 2>/dev/null; then if hash wget 2>/dev/null; then
@ -81,7 +81,7 @@ fetchSource() (
[[ -e $files ]] || { [[ -e $files ]] || {
echo echo
echo "Unpacking: ${PWD##*/}, using package..." echo "Unpacking: ${PWD##*/}, using package..."
unpack "${pkg##*/}" "$pkg_sha" unpack "${pkg##*/}" "$pkg_sha256"
} }
elif [[ $git ]] && hash git 2>/dev/null; then elif [[ $git ]] && hash git 2>/dev/null; then
@ -114,7 +114,7 @@ fetchSource() (
echo echo
echo "Fetching: ${PWD##*/}, using package..." echo "Fetching: ${PWD##*/}, using package..."
fetch "$pkg" fetch "$pkg"
unpack "${pkg##*/}" "$pkg_sha" unpack "${pkg##*/}" "$pkg_sha256"
} }
else else

View File

@ -1,3 +1,3 @@
home=http://www.openwall.com/crypt/ home=http://www.openwall.com/crypt/
pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz
pkg_sha=461ba876ebacd5f7dc95f1eb3c5286d6e0983ae0 pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd

View File

@ -1,4 +1,4 @@
home=https://code.google.com/p/scrypt/ home=https://code.google.com/p/scrypt/
svn=http://scrypt.googlecode.com/svn svn=http://scrypt.googlecode.com/svn
pkg=http://masterpasswordapp.com/libscrypt-b12b554.tar.gz pkg=http://masterpasswordapp.com/libscrypt-b12b554.tar.gz
pkg_sha=a86445c3e031392d20652f4163adfd3fb0b1994e pkg_sha256=c726daec68a345e420896f005394a948dc5a6924713ed94b684c856d4c247f0b