diff options
Diffstat (limited to 'crypto/nss/PRE_BUILD')
| -rwxr-xr-x | crypto/nss/PRE_BUILD | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD index 9828554386..3c7394dfed 100755 --- a/crypto/nss/PRE_BUILD +++ b/crypto/nss/PRE_BUILD @@ -1,14 +1,27 @@ -default_pre_build && +default_pre_build && +cd "$SOURCE_DIRECTORY" && -cd $SOURCE_DIRECTORY && - -if [[ $NSS_BRANCH == "3.14" || $NSS_BRANCH == "DEFAULT" ]]; then +if [[ $NSS_BRANCH == "3.17" ]]; then + patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch" +elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH == "3.16" ]]; then + patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch +elif [[ $NSS_BRANCH == "3.14" ]]; then patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch else patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch fi && if [[ "$NSS_PEM" == "y" ]]; then -tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 && -patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch + # New or old source trees are easy to tell apart. + if test -e nss; then + tar jxvf $SCRIPT_DIRECTORY/nss-pem-20140808.tar.bz2 && + patch -p3 < $SCRIPT_DIRECTORY/nss-enable-pem.patch + else + # Playing safe with old stuff, no new PEM source there. + tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 && + patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch + fi && + if [[ $NSS_BRANCH == "3.14" ]]; then + patch -p1 < $SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch + fi fi |