You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2019/06/07 18:58:26 UTC
[vcl] branch develop updated: vcl-install.sh and vcl-upgrade.sh:
updated VCL_VERSION from 2.5 to 2.5.1;
changed all occurances of "sha1" to "sha512"
This is an automated email from the ASF dual-hosted git repository.
jfthomps pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/vcl.git
The following commit(s) were added to refs/heads/develop by this push:
new 0975664 vcl-install.sh and vcl-upgrade.sh: updated VCL_VERSION from 2.5 to 2.5.1; changed all occurances of "sha1" to "sha512"
0975664 is described below
commit 0975664e711f8ecf60c2bd10f86526e8ca856224
Author: Josh Thompson <jf...@ncsu.edu>
AuthorDate: Fri Jun 7 14:56:21 2019 -0400
vcl-install.sh and vcl-upgrade.sh: updated VCL_VERSION from 2.5 to 2.5.1; changed all occurances of "sha1" to "sha512"
---
vcl-install.sh | 20 ++++++++++----------
vcl-upgrade.sh | 18 +++++++++---------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/vcl-install.sh b/vcl-install.sh
index d4eed6c..89bd375 100755
--- a/vcl-install.sh
+++ b/vcl-install.sh
@@ -69,7 +69,7 @@ if [ $? -ne 0 ]; then help; fi
eval set -- "$args"
# ------------------------- variables -------------------------------
-VCL_VERSION=2.5
+VCL_VERSION=2.5.1
DB_USERNAME=vcluser
ADMIN_PASSWORD=
@@ -433,7 +433,7 @@ function set_localauth_password() {
salt=$(random_string 8)
#echo "Password salt: $salt"
- passhash=$(echo -n $password$salt | sha1sum | awk '{print $1}')
+ passhash=$(echo -n $password$salt | sha512sum | awk '{print $1}')
#echo "Password hash: $passhash"
mysql -e "UPDATE localauth SET passhash = '$passhash', salt = '$salt', lastupdated = NOW() WHERE localauth.userid = (SELECT id FROM user WHERE unityid = '$username');" vcl
if [ $? -ne 0 ]; then
@@ -450,12 +450,12 @@ function download_archive() {
if [ $? -ne 0 ]; then generic_error "failed to download $ARCHIVE from $ARCHIVEURLPATH"; exit 1; fi
}
-function validate_archive_sha1() {
- echo "Downloading sha1 file for $VCL_VERSION..."
- /bin/rm -f $ARCHIVE.sha1
- wget -q $SIGPATH$ARCHIVE.sha1
+function validate_archive_sha512() {
+ echo "Downloading sha512 file for $VCL_VERSION..."
+ /bin/rm -f $ARCHIVE.sha512
+ wget -q $SIGPATH$ARCHIVE.sha512
echo "validating $ARCHIVE"
- sha1sum -c $ARCHIVE.sha1
+ sha512sum -c $ARCHIVE.sha512
return $?
}
@@ -487,19 +487,19 @@ cd $WORKPATH
if [[ ! -f $ARCHIVE ]]; then
echo "Downloading VCL $VCL_VERSION..."
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
else
dir=`pwd`
echo "archive for $VCL_VERSION found at $dir/$ARCHIVE"
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then
echo "failed to validate $ARCHIVE; downloading again..."
/bin/mv -f $ARCHIVE $ARCHIVE.old
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
diff --git a/vcl-upgrade.sh b/vcl-upgrade.sh
index 4998fbf..a287323 100755
--- a/vcl-upgrade.sh
+++ b/vcl-upgrade.sh
@@ -62,7 +62,7 @@ if [ $? -ne 0 ]; then help; fi
eval set -- "$args"
# ------------------------- variables -------------------------------
-VCL_VERSION=2.5
+VCL_VERSION=2.5.1
OLD_VERSION=""
DB_NAME=vcl
WEB_PATH=/var/www/html/vcl
@@ -300,12 +300,12 @@ function download_archive() {
if [ $? -ne 0 ]; then generic_error "failed to download $ARCHIVE from $ARCHIVEURLPATH"; exit 1; fi
}
-function validate_archive_sha1() {
- echo "Downloading sha1 file for $VCL_VERSION..."
- /bin/rm -f $ARCHIVE.sha1
- wget -q $SIGPATH$ARCHIVE.sha1
+function validate_archive_sha512() {
+ echo "Downloading sha512 file for $VCL_VERSION..."
+ /bin/rm -f $ARCHIVE.sha512
+ wget -q $SIGPATH$ARCHIVE.sha512
echo "validating $ARCHIVE"
- sha1sum -c $ARCHIVE.sha1
+ sha512sum -c $ARCHIVE.sha512
return $?
}
@@ -586,19 +586,19 @@ cd $WORKPATH
if [[ ! -f $ARCHIVE ]]; then
echo "Downloading VCL $VCL_VERSION..."
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
else
dir=`pwd`
echo "archive for $VCL_VERSION found at $dir/$ARCHIVE"
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then
echo "failed to validate $ARCHIVE; downloading again..."
/bin/mv -f $ARCHIVE $ARCHIVE.old
download_archive
- validate_archive_sha1
+ validate_archive_sha512
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;
validate_archive_gpg
if [ $? -ne 0 ]; then generic_error "failed to validate $ARCHIVE"; exit 1; fi;