diff options
| -rwxr-xr-x | ext/bin/tap-mac/com.zerotier.tap.kext/Contents/MacOS/tap | bin | 50496 -> 0 bytes | |||
| -rw-r--r-- | ext/bin/tap-mac/tap.kext.old/Contents/Info.plist (renamed from ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist) | 2 | ||||
| -rwxr-xr-x | ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap | bin | 0 -> 81240 bytes | |||
| -rw-r--r-- | ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory (renamed from ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory) | bin | 145 -> 145 bytes | |||
| -rw-r--r-- | ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements (renamed from ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements) | bin | 176 -> 176 bytes | |||
| -rw-r--r-- | ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources (renamed from ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources) | 0 | ||||
| -rw-r--r-- | ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature (renamed from ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature) | bin | 8578 -> 8578 bytes | |||
| -rw-r--r-- | ext/bin/tap-mac/tap.kext/Contents/Info.plist | 2 | ||||
| -rwxr-xr-x | ext/bin/tap-mac/tap.kext/Contents/MacOS/tap | bin | 81240 -> 50496 bytes | |||
| -rwxr-xr-x | ext/installfiles/mac/launch.sh | 10 | ||||
| -rwxr-xr-x | ext/installfiles/mac/postinst.sh | 6 |
11 files changed, 7 insertions, 13 deletions
diff --git a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/MacOS/tap b/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/MacOS/tap Binary files differdeleted file mode 100755 index 48bf9625..00000000 --- a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/MacOS/tap +++ /dev/null diff --git a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist b/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist index c20eefa5..45c2839a 100644 --- a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist +++ b/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>KEXT</string> <key>CFBundleShortVersionString</key> - <string>20150118</string> + <string>20131028</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap b/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap Binary files differnew file mode 100755 index 00000000..6a9021a7 --- /dev/null +++ b/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap diff --git a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory Binary files differindex 58c421c2..58c421c2 100644 --- a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory +++ b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory diff --git a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements Binary files differindex 1df93129..1df93129 100644 --- a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements +++ b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements diff --git a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources index 0710b400..0710b400 100644 --- a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources +++ b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources diff --git a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature Binary files differindex 64429727..64429727 100644 --- a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature +++ b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature diff --git a/ext/bin/tap-mac/tap.kext/Contents/Info.plist b/ext/bin/tap-mac/tap.kext/Contents/Info.plist index 45c2839a..c20eefa5 100644 --- a/ext/bin/tap-mac/tap.kext/Contents/Info.plist +++ b/ext/bin/tap-mac/tap.kext/Contents/Info.plist @@ -15,7 +15,7 @@ <key>CFBundlePackageType</key> <string>KEXT</string> <key>CFBundleShortVersionString</key> - <string>20131028</string> + <string>20150118</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> diff --git a/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap Binary files differindex 6a9021a7..48bf9625 100755 --- a/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap +++ b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap diff --git a/ext/installfiles/mac/launch.sh b/ext/installfiles/mac/launch.sh index ef22ccbd..41c4b9c8 100755 --- a/ext/installfiles/mac/launch.sh +++ b/ext/installfiles/mac/launch.sh @@ -1,15 +1,7 @@ #!/bin/bash zthome="/Library/Application Support/ZeroTier/One" -export PATH="/bin:/usr/bin:/sbin:/usr/sbin:$zthome" - -# If the app has been deleted, uninstall the service -cd "$zthome" -if [ -L './shutdownIfUnreadable' -a ! -f "`readlink ./shutdownIfUnreadable`" ]; then - rm -f /tmp/ZeroTierOneUninstall.log - /bin/bash "$zthome/uninstall.sh" >/tmp/ZeroTierOneUninstall.log 2>&1 - exit 0 -fi +export PATH="$zthome:/bin:/usr/bin:/sbin:/usr/sbin" # Launch ZeroTier One (not as daemon... launchd monitors it) exec zerotier-one diff --git a/ext/installfiles/mac/postinst.sh b/ext/installfiles/mac/postinst.sh index 987e131b..47d9ddd9 100755 --- a/ext/installfiles/mac/postinst.sh +++ b/ext/installfiles/mac/postinst.sh @@ -6,10 +6,12 @@ launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1 cd "/Library/Application Support/ZeroTier/One" rm -rf node.log node.log.old root-topology shutdownIfUnreadable autoupdate.log updates.d +chown -R 0 tap.kext +chgrp -R 0 tap.kext if [ ! -f authtoken.secret ]; then head -c 4096 /dev/urandom | md5 | head -c 24 >authtoken.secret - chown root authtoken.secret - chgrp wheel authtoken.secret + chown 0 authtoken.secret + chgrp 0 authtoken.secret chmod 0600 authtoken.secret fi rm -f zerotier-cli zerotier-idtool |