Diff

Differences From Artifact [14980c7d5f]:

To Artifact [37f2acc21e]:


   143    143   	rm -f build/cackey_osx_build/cackey.dylib
   144    144   	ln macbuild/${OSX}/libcackey.dylib build/cackey_osx_build/cackey.dylib
   145    145   	rm -rf build/cackey_osx_build/PKCS11.tokend
   146    146   	if [ "${LIONBUILD}" = 1 ]; then
   147    147   		TAR=gnutar
   148    148   	else
   149    149   		TAR=tar
          150  +	fi
          151  +	TOKENDSHA256="800a1d307df4117b2096a824dfc7ccca1ebecb5caf5fa98c1e531ac6f6b672a0"
          152  +	curl http://devel.kvanals.org/PKCS11_Tokend/PKCS11_tokend-latest.tar.gz > PKCS11_tokend-latest.tar.gz
          153  +	if [ "${TOKENDSHA256}" != "`shasum -a 256 PKCS11_tokend-latest.tar.gz | awk '{print $1}'`" ]; then
          154  +		echo "SHA-256 Checksum does NOT match for TokenD!  Verify there was a new upstream release and update the build script!"
          155  +		rm -f PKCS11_tokend-latest.tar.gz
          156  +		exit 1
   150    157   	fi
   151    158   	if [ "${OSX}" = "Leopard" ]; then
   152         -		curl http://devel.kvanals.org/PKCS11_Tokend/PKCS11_tokend-latest.tar.gz | gzip -d -c | ${TAR} --strip-components 3 --wildcards -x -f - "PKCS11_tokend-*/prebuilt/leopard/PKCS11.tokend"
          159  +		cat PKCS11_tokend-latest.tar.gz | gzip -d -c | ${TAR} --strip-components 3 --wildcards -x -f - "PKCS11_tokend-*/prebuilt/leopard/PKCS11.tokend"
          160  +		rm -f PKCS11_tokend-latest.tar.gz
   153    161   		mv PKCS11.tokend build/cackey_osx_build/PKCS11.tokend
   154    162   	else
   155         -		curl http://devel.kvanals.org/PKCS11_Tokend/PKCS11_tokend-latest.tar.gz | gzip -d -c | ${TAR} --strip-components 3 --wildcards -x -f - "PKCS11_tokend-*/prebuilt/snowleopard/PKCS11.tokend"
          163  +		cat PKCS11_tokend-latest.tar.gz | gzip -d -c | ${TAR} --strip-components 3 --wildcards -x -f - "PKCS11_tokend-*/prebuilt/snowleopard/PKCS11.tokend"
          164  +		rm -f PKCS11_tokend-latest.tar.gz
   156    165   		mv PKCS11.tokend build/cackey_osx_build/PKCS11.tokend
   157    166   	fi
   158    167   	for PMDOC in build/cackey_osx_build/Template_pmbuild/*.in; do
   159    168   		PMDOC="`echo "${PMDOC}" | sed 's|l.in|l|g' | sed 's|build/cackey_osx_build/Template_pmbuild/||g'`"
   160    169   		UUID="`python -c 'import uuid; print uuid.uuid1()' | dd conv=ucase 2>/dev/null`"
   161    170   		mkdir -p build/cackey_osx_build/${OSX}_pmbuild.pmdoc
   162    171   		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" build/cackey_osx_build/Template_pmbuild/${PMDOC}.in > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}