Bump OS X version from 2.1.1 to 2.1.2

On OS X, work around filesystem corruption triggered by having hard
links in /tmp, by using a symlink instead.

fish.xcodeproj/project.pbxproj

@@ -1190,7 +1190,7 @@
 					"DATADIR=L\\\"/usr/local/share\\\"",
 					"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
 					"BINDIR=L\\\"/usr/local/bin\\\"",
-					"FISH_BUILD_VERSION=\\\"2.1.1\\\"",
+					"FISH_BUILD_VERSION=\\\"2.1.2\\\"",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1342,7 +1342,7 @@
 					"DATADIR=L\\\"/usr/local/share\\\"",
 					"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
 					"BINDIR=L\\\"/usr/local/bin\\\"",
-					"FISH_BUILD_VERSION=\\\"2.1.1\\\"",
+					"FISH_BUILD_VERSION=\\\"2.1.2\\\"",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1370,7 +1370,7 @@
 					"DATADIR=L\\\"/usr/local/share\\\"",
 					"SYSCONFDIR=L\\\"/usr/local/etc\\\"",
 					"BINDIR=L\\\"/usr/local/bin\\\"",
-					"FISH_BUILD_VERSION=\\\"2.1.1\\\"",
+					"FISH_BUILD_VERSION=\\\"2.1.2\\\"",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;

fishd.cpp

@@ -626,12 +626,21 @@ repeat:
 
     // Attempt to hardlink the old socket name so that old versions of fish keep working on upgrade
     // Not critical if it fails
+    // On OS X, we use symlinks instead of hardlinks to work around a filesystem corruption bug http://openradar.appspot.com/19687545
+    // On Linux, we use hardlinks instead of symlinks for compatibility with the Yama security model - see #1859
+    int (*linkfunc)(const char *, const char *);
+#if __APPLE__
+    linkfunc = symlink;
+#else
+    linkfunc = link;
+#endif
+
     if (unlink(old_sock_name.c_str()) != 0 && errno != ENOENT)
     {
         debug(0, L"Could not create legacy socket path");
         wperror(L"unlink");
     }
-    else if (link(sock_name.c_str(), old_sock_name.c_str()) != 0)
+    else if (linkfunc(sock_name.c_str(), old_sock_name.c_str()) != 0)
     {
         debug(0, L"Could not create legacy socket path");
         wperror(L"link");

osx/config.h

@@ -183,7 +183,7 @@
 #define PACKAGE_NAME "fish"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fish 2.1.1"
+#define PACKAGE_STRING "fish 2.1.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "fish"
@@ -192,7 +192,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1.1"
+#define PACKAGE_VERSION "2.1.2"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1