From e4d1aba3f82c1265579b0b9dfba22903e34ae7d1 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 16 Nov 2015 16:19:24 -0800 Subject: Use new OSX tap version, and update OSX install scripts. --- .../com.zerotier.tap.kext/Contents/Info.plist | 36 ------- .../com.zerotier.tap.kext/Contents/MacOS/tap | Bin 50496 -> 0 bytes .../Contents/_CodeSignature/CodeResources | 105 --------------------- ext/bin/tap-mac/tap.kext.old/Contents/Info.plist | 36 +++++++ ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap | Bin 0 -> 81240 bytes .../Contents/_CodeSignature/CodeDirectory | Bin 0 -> 145 bytes .../Contents/_CodeSignature/CodeRequirements | Bin 0 -> 176 bytes .../Contents/_CodeSignature/CodeResources | 105 +++++++++++++++++++++ .../Contents/_CodeSignature/CodeSignature | Bin 0 -> 8578 bytes ext/bin/tap-mac/tap.kext/Contents/Info.plist | 2 +- ext/bin/tap-mac/tap.kext/Contents/MacOS/tap | Bin 81240 -> 50496 bytes .../tap.kext/Contents/_CodeSignature/CodeDirectory | Bin 145 -> 0 bytes .../Contents/_CodeSignature/CodeRequirements | Bin 176 -> 0 bytes .../tap.kext/Contents/_CodeSignature/CodeSignature | Bin 8578 -> 0 bytes ext/installfiles/mac/launch.sh | 10 +- ext/installfiles/mac/postinst.sh | 6 +- 16 files changed, 147 insertions(+), 153 deletions(-) delete mode 100644 ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist delete mode 100755 ext/bin/tap-mac/com.zerotier.tap.kext/Contents/MacOS/tap delete mode 100644 ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources create mode 100644 ext/bin/tap-mac/tap.kext.old/Contents/Info.plist create mode 100755 ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap create mode 100644 ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory create mode 100644 ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements create mode 100644 ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources create mode 100644 ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature delete mode 100644 ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory delete mode 100644 ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements delete mode 100644 ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature (limited to 'ext') diff --git a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist b/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist deleted file mode 100644 index c20eefa5..00000000 --- a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - tap - CFBundleIdentifier - com.zerotier.tap - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - tap - CFBundlePackageType - KEXT - CFBundleShortVersionString - 20150118 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - OSBundleLibraries - - com.apple.kpi.mach - 8.0 - com.apple.kpi.bsd - 8.0 - com.apple.kpi.libkern - 8.0 - com.apple.kpi.unsupported - 8.0 - - - - 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 deleted file mode 100755 index 48bf9625..00000000 Binary files a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/MacOS/tap and /dev/null differ diff --git a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources b/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources deleted file mode 100644 index 0710b400..00000000 --- a/ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources +++ /dev/null @@ -1,105 +0,0 @@ - - - - - files - - files2 - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist b/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist new file mode 100644 index 00000000..45c2839a --- /dev/null +++ b/ext/bin/tap-mac/tap.kext.old/Contents/Info.plist @@ -0,0 +1,36 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + tap + CFBundleIdentifier + com.zerotier.tap + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + tap + CFBundlePackageType + KEXT + CFBundleShortVersionString + 20131028 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + OSBundleLibraries + + com.apple.kpi.mach + 8.0 + com.apple.kpi.bsd + 8.0 + com.apple.kpi.libkern + 8.0 + com.apple.kpi.unsupported + 8.0 + + + + diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap b/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap new file mode 100755 index 00000000..6a9021a7 Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap differ diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory new file mode 100644 index 00000000..58c421c2 Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory differ diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements new file mode 100644 index 00000000..1df93129 Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements differ diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources new file mode 100644 index 00000000..0710b400 --- /dev/null +++ b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources @@ -0,0 +1,105 @@ + + + + + files + + files2 + + rules + + ^Resources/ + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ + + nested + + weight + 10 + + ^.* + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^Resources/ + + weight + 20 + + ^Resources/.*\.lproj/ + + optional + + weight + 1000 + + ^Resources/.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^[^/]+$ + + nested + + weight + 10 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature new file mode 100644 index 00000000..64429727 Binary files /dev/null and b/ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature differ 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 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 20131028 + 20150118 CFBundleSignature ???? CFBundleVersion diff --git a/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap index 6a9021a7..48bf9625 100755 Binary files a/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap and b/ext/bin/tap-mac/tap.kext/Contents/MacOS/tap differ diff --git a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory b/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory deleted file mode 100644 index 58c421c2..00000000 Binary files a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory and /dev/null differ diff --git a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements b/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements deleted file mode 100644 index 1df93129..00000000 Binary files a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements and /dev/null differ diff --git a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature b/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature deleted file mode 100644 index 64429727..00000000 Binary files a/ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature and /dev/null differ 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 -- cgit v1.2.3