Check-in [a4a018ea4d]
Overview
Comment:Updated Mac OS X Build to support installation on 10.11 "El Capitan" after external project (TokenD) did the same
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:a4a018ea4d4ec0dc43bf20c59235c68ef1ea28e2
User & Date: kvanals on 2015-07-13 20:21:50
Other Links: manifest | tags
Context
2015-07-15
18:47
Updated KPS CA Certs check-in: efe7692225 user: rkeene tags: trunk
2015-07-13
20:21
Updated Mac OS X Build to support installation on 10.11 "El Capitan" after external project (TokenD) did the same check-in: a4a018ea4d user: kvanals tags: trunk
2015-07-03
01:57
CACKey 0.7.3 check-in: 9c86f3a63d user: kvanals tags: trunk, 0.7.3
Changes

Modified build/cackey_osx_build/Template_pmbuild/03libcackey.xml.in from [b6742d933b] to [afd3f433a1].

     2      2   	<config>
     3      3   		<identifier>mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.cackey.pkg</identifier>
     4      4   		<version>1</version>
     5      5   		<description></description>
     6      6   		<post-install type="none"/>
     7      7   		<requireAuthorization/>
     8      8   		<installFrom relative="true" mod="true">cackey.dylib</installFrom>
     9         -		<installTo mod="true" relocatable="true">/usr/lib/pkcs11</installTo>
            9  +		<installTo mod="true" relocatable="true">/usr/local/lib/pkcs11</installTo>
    10     10   		<flags></flags>
    11     11   		<packageStore type="internal"></packageStore>
    12     12   		<mod>parent</mod>
    13     13   		<mod>scripts.postinstall.path</mod>
    14     14   		<mod>scripts.scriptsDirectoryPath.isRelativeType</mod>
    15     15   		<mod>scripts.scriptsDirectoryPath.path</mod>
    16     16   		<mod>installTo.isAbsoluteType</mod>

Modified build/cackey_osx_build/Template_pmbuild/04pkcs11tokend.xml.in from [793db41bea] to [4eff712abd].

     2      2   	<config>
     3      3   		<identifier>mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.PKCS11.pkg</identifier>
     4      4   		<version>1</version>
     5      5   		<description></description>
     6      6   		<post-install type="none"/>
     7      7   		<requireAuthorization/>
     8      8   		<installFrom relative="true" mod="true">PKCS11.tokend</installFrom>
     9         -		<installTo mod="true" relocatable="true">/System/Library/Security/tokend/PKCS11.tokend</installTo>
            9  +		<installTo mod="true" relocatable="true">/Library/Security/tokend/PKCS11.tokend</installTo>
    10     10   		<flags></flags>
    11     11   		<packageStore type="internal"></packageStore>
    12     12   		<mod>parent</mod>
    13     13   		<mod>scripts.postinstall.path</mod>
    14     14   		<mod>scripts.scriptsDirectoryPath.isRelativeType</mod>
    15     15   		<mod>scripts.scriptsDirectoryPath.path</mod>
    16     16   		<mod>installTo.isAbsoluteType</mod>

Modified build/cackey_osx_build/Template_pmbuild/index.xml.in from [6d6f116270] to [75581e5581].

    65     65   {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
    66     66   {\colortbl;\red255\green255\blue255;}
    67     67   \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
    68     68   
    69     69   \f0\fs26 \cf0 Thank you for choosing to install CACKey.\
    70     70   \
    71     71   To use CACKey, install /Library/CACKey/libcackey.dylib or\
    72         -/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
           72  +/usr/local/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
    73     73   \
    74         -A PKCS11 Connector for Tokend (Keychain Access) will be installed in /System/Library/Security/tokend.\
           74  +A PKCS11 Connector for Tokend (Keychain Access) will be installed in /Library/Security/tokend.\
    75     75   To use, be sure to import the certificate authorities into Keychain Access.\
    76     76   \
    77     77   A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
    78     78   			</resource>
    79     79   		</locale>
    80     80   	</resources>
    81     81   	<requirements>

Modified build/cackey_osx_build/Template_pmbuild/scripts/03libcackey-post.sh from [1ca797dc96] to [a53c7a2b82].

     1      1   #!/bin/bash
     2         -chmod 755 /usr/lib/pkcs11
     3         -chown root:wheel /usr/lib/pkcs11
            2  +chmod 755 /usr/local/lib/pkcs11
            3  +chown root:wheel /usr/local/lib/pkcs11

Modified build/cackey_osx_build/Template_pmbuild/scripts/04pkcs11tokend-post.sh from [1f1313960f] to [022fa1323e].

     1      1   #!/bin/bash
     2         -chmod -R go+rX /System/Library/Security/tokend/PKCS11.tokend
     3         -chown -R root:wheel /System/Library/Security/tokend/PKCS11.tokend
            2  +chmod -R go+rX /Library/Security/tokend/PKCS11.tokend
            3  +chown -R root:wheel /Library/Security/tokend/PKCS11.tokend