From ec671ad23b64c94704ed2dda5e4ba7959316bb5b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 12 Mar 2018 07:38:20 +0100
Subject: v3.1.4 from Fedora:

- fix dependencies
- Update to 3.1.4 (RHBZ #1528489, SSPSA 201801-01, CVE-2018-6519, SSPSA 201802-01, CVE-2018-7644, SSPSA 201803-01, CVE-2018-7711)
- License changed from LGPLv2 to LGPLv2+
- Update "get source" to save tarball in same directory as spec file
- Use range dependencies on F27+
---
 php-simplesamlphp-saml2_3-get-source.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'php-simplesamlphp-saml2_3-get-source.sh')

diff --git a/php-simplesamlphp-saml2_3-get-source.sh b/php-simplesamlphp-saml2_3-get-source.sh
index 4ad1051..b2ac62b 100755
--- a/php-simplesamlphp-saml2_3-get-source.sh
+++ b/php-simplesamlphp-saml2_3-get-source.sh
@@ -24,6 +24,10 @@ else
     SPEC=`ls *.spec | head -1`
 fi
 
+SPEC_DIR=`pwd`
+
+print "SPEC_DIR = $SPEC_DIR"
+
 NAME=`echo $SPEC | sed 's#\.spec##'`
 VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'`
 
@@ -43,8 +47,6 @@ print "GIT_REPO = $GIT_REPO"
 print "GIT_DIR = $GIT_DIR"
 
 TEMP_DIR=$(mktemp --dir)
-TAR_FILE=$PWD/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz
-CMP_FILE=$PWD/composer.json
 
 pushd $TEMP_DIR
     print "Cloning git repo..."
@@ -53,7 +55,6 @@ pushd $TEMP_DIR
     pushd $GIT_DIR
         print "Checking out commit..."
         $GIT checkout $GIT_COMMIT
-        cp composer.json $CMP_FILE
     popd
 
     TAR_DIR=${GIT_NAME}-${GIT_COMMIT}
@@ -61,6 +62,7 @@ pushd $TEMP_DIR
 
     mv $GIT_DIR $TAR_DIR
 
+    TAR_FILE=${SPEC_DIR}/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz
     print "TAR_FILE = $TAR_FILE"
 
     [ -e $TAR_FILE ] && rm -f $TAR_FILE
-- 
cgit