diff options
| author | kali <kali@leap.se> | 2013-01-16 06:03:05 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-16 06:02:34 +0900 |
| commit | 42c4ee53a8311164d82d10b1f6d19ae7604346c6 (patch) | |
| tree | 6dd88eb485b52fa006d596214aee1ff7f5c89053 | |
| parent | 67506fe6ba55ac7eaf4cbfd3606bff34a1214c11 (diff) | |
add libgnutls lib to osx build
| -rwxr-xr-x | pkg/osx/install/install-leapc.sh | 9 | ||||
| -rw-r--r-- | pkg/osx/leap-client.spec | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkg/osx/install/install-leapc.sh b/pkg/osx/install/install-leapc.sh index 7a0d3a5e..a2435adf 100755 --- a/pkg/osx/install/install-leapc.sh +++ b/pkg/osx/install/install-leapc.sh @@ -5,6 +5,13 @@ cp -r "LEAP Client.app" "/Applications" echo "Copying openvpn binary" cp -r openvpn.leap /usr/bin +echo "Installing gnutls" +mkdir -p /opt/local/lib +mv -f "/Applications/LEAP Client.app/Contents/MacOS/libgnutls.26.dylib" /opt/local/lib +mv -f "/Applications/LEAP Client.app/Contents/MacOS/libgnutls-extra.26.dylib" /opt/local/lib +ln -sf /opt/local/lib/libgnutls.26.dylib /opt/local/lib/libgnutls.dylib +ln -sf /opt/local/lib/libgnutls-extra.26.dylib /opt/local/lib/libgnutls-extra.dylib + echo "Installing tun/tap drivers" cp -r Extensions/* /Library/Extensions @@ -15,4 +22,4 @@ echo "Loading tun/tap kernel extension" echo "Installation Finished!" -open /Applications/LEAP\ Client.app/ +ln -s /Applications/LEAP\ Client.app/ /Volumes/LEAP\ Client\ installer/ diff --git a/pkg/osx/leap-client.spec b/pkg/osx/leap-client.spec index 04f45253..65496469 100644 --- a/pkg/osx/leap-client.spec +++ b/pkg/osx/leap-client.spec @@ -18,7 +18,11 @@ coll = COLLECT(exe, a.binaries + # this will easitly break if we setup the venv # somewhere else. FIXME - [('cacert.pem', '../../../../lib/python2.6/site-packages/requests/cacert.pem', 'DATA')], + [('cacert.pem', '../../../../lib/python2.6/site-packages/requests/cacert.pem', 'DATA'), + # XXX osx only + ('libgnutls.26.dylib', '/opt/local/lib/libgnutls.26.dylib', 'BINARY'), + ('libgnutls-extra.26.dylib', '/opt/local/lib/libgnutls-extra.26.dylib', 'BINARY'), + ], a.zipfiles, a.datas, strip=True, |