From d73edfea5654665a2b491c4570369d6410363db2 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 30 Nov 2015 16:12:03 -0800
Subject: GitHub issue #257

---
 .../ZeroTier One.app/Contents/MacOS/ZeroTier One   | Bin 152736 -> 152736 bytes
 .../Contents/Resources/en.lproj/Window.nib         | Bin 3723 -> 3616 bytes
 .../Contents/_CodeSignature/CodeResources          |   4 ++--
 .../src/MacGap/en.lproj/Window.xib                 |  16 ++++++++--------
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ext')

diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One
index ba15bca9..8e38b861 100755
Binary files a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One and b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/MacOS/ZeroTier One differ
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib
index 69258da6..e7b174a1 100644
Binary files a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib and b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/Resources/en.lproj/Window.nib differ
diff --git a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources
index 14556923..5e334db0 100644
--- a/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources	
+++ b/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app/Contents/_CodeSignature/CodeResources	
@@ -39,7 +39,7 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			7dgumnPDtoIzhi9QoaFhDvCo9ys=
+			aP0mIANPPnnTMmxYlELioz9ZO1I=
 			</data>
 			<key>optional</key>
 			<true/>
@@ -82,7 +82,7 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			7dgumnPDtoIzhi9QoaFhDvCo9ys=
+			aP0mIANPPnnTMmxYlELioz9ZO1I=
 			</data>
 			<key>optional</key>
 			<true/>
diff --git a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
index 2c46b79f..fa70acaa 100644
--- a/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
+++ b/ext/mac-ui-macgap1-wrapper/src/MacGap/en.lproj/Window.xib
@@ -13,22 +13,22 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" animationBehavior="default" id="1">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
-            <rect key="contentRect" x="575" y="564" width="500" height="700"/>
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <rect key="contentRect" x="575" y="564" width="500" height="500"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/>
-            <value key="minSize" type="size" width="500" height="700"/>
-            <value key="maxSize" type="size" width="500" height="700"/>
             <view key="contentView" id="2" customClass="ContentView">
-                <rect key="frame" x="0.0" y="0.0" width="500" height="700"/>
+                <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <webView id="5">
-                        <rect key="frame" x="0.0" y="0.0" width="500" height="700"/>
+                        <rect key="frame" x="0.0" y="0.0" width="500" height="500"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <animations/>
-                        <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12"/>
+                        <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12">
+                            <nil key="identifier"/>
+                        </webPreferences>
                     </webView>
                 </subviews>
                 <animations/>
-- 
cgit v1.2.3


From be44b15eacc7f34365d86e717e847b86000cbec4 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 30 Nov 2015 16:15:23 -0800
Subject: Fix for GitHub issue #252

---
 ext/installfiles/linux/DEBIAN/control.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ext')

diff --git a/ext/installfiles/linux/DEBIAN/control.in b/ext/installfiles/linux/DEBIAN/control.in
index d774b61e..dab6587f 100644
--- a/ext/installfiles/linux/DEBIAN/control.in
+++ b/ext/installfiles/linux/DEBIAN/control.in
@@ -3,6 +3,7 @@ Architecture: __ARCH__
 Maintainer: ZeroTier, Inc. <contact@zerotier.com>
 Priority: optional
 Version: __VERSION__
+Installed-Size: 1024
 Homepage: https://github.com/zerotier/ZeroTierOne
 Description: ZeroTier One network virtualization service
  ZeroTier One is a fast, secure, and easy to use peer to peer network
-- 
cgit v1.2.3


From a4cfe4cd1650ea7e9aada0b004fd7aade2e43ced Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 1 Dec 2015 10:19:10 -0800
Subject: Fix Linux init script to properly specify runlevels.

---
 ext/installfiles/linux/init.d/zerotier-one | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'ext')

diff --git a/ext/installfiles/linux/init.d/zerotier-one b/ext/installfiles/linux/init.d/zerotier-one
index c8e7615e..b0a8aa41 100755
--- a/ext/installfiles/linux/init.d/zerotier-one
+++ b/ext/installfiles/linux/init.d/zerotier-one
@@ -7,21 +7,20 @@
 #              networks. See https://www.zerotier.com/ for more information.
 
 ### BEGIN INIT INFO
-# Provides: zerotier-one
-# Required-Start: $local_fs $network
-# Required-Stop: $local_fs
-# Default-Start:  2345
-# Default-Stop: 90
-# Short-Description: start ZeroTier One
-# Description: ZeroTier One provides public and private distributed ethernet \
-#              networks. See https://www.zerotier.com/ for more information.
+# Provides:          zerotier-one
+# Required-Start:    $local_fs $network
+# Required-Stop:     $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start ZeroTier One
+# Description:       ZeroTier One provides public and private distributed ethernet \
+#                    networks. See https://www.zerotier.com/ for more information.
 ### END INIT INFO
 
 #
 # This script is written to avoid distro-specific dependencies, so it does not
 # use the rc bash script libraries found on some systems. It should work on
-# just about anything, even systems using Upstart. Upstart native support may
-# come in the future.
+# just about anything.
 #
 
 zthome=/var/lib/zerotier-one
-- 
cgit v1.2.3