Skip to content

Commit

Permalink
Initial Patches to build from sources
Browse files Browse the repository at this point in the history
  • Loading branch information
csekel committed May 20, 2016
1 parent ad65611 commit 46291c3
Show file tree
Hide file tree
Showing 3 changed files with 241 additions and 0 deletions.
67 changes: 67 additions & 0 deletions BootCache-110.2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
Binary files BootCache-110.2.orig/.DS_Store and BootCache-110.2/.DS_Store differ
diff -ru BootCache-110.2.orig/BootCache.xcodeproj/project.pbxproj BootCache-110.2/BootCache.xcodeproj/project.pbxproj
--- BootCache-110.2.orig/BootCache.xcodeproj/project.pbxproj 2015-03-03 17:31:41.000000000 -0500
+++ BootCache-110.2/BootCache.xcodeproj/project.pbxproj 2016-05-20 04:00:52.000000000 -0400
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 46;
+ objectVersion = 47;
objects = {

/* Begin PBXAggregateTarget section */
@@ -329,7 +329,7 @@
LastUpgradeCheck = 0700;
};
buildConfigurationList = 42F550340A77D4BD00672F71 /* Build configuration list for PBXProject "BootCache" */;
- compatibilityVersion = "Xcode 3.2";
+ compatibilityVersion = "Xcode 6.3";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -483,7 +483,7 @@
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
- SDKROOT = macosx.internal;
+ SDKROOT = macosx10.10;
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
@@ -500,7 +500,7 @@
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
- SDKROOT = macosx.internal;
+ SDKROOT = macosx10.10;
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
@@ -533,10 +533,12 @@
89F255720DAABEAD00CA7984 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
OTHER_LDFLAGS = "";
PRODUCT_NAME = BootCache;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
ZERO_LINK = YES;
};
@@ -545,9 +547,11 @@
89F255770DAABEAD00CA7984 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
OTHER_LDFLAGS = "";
PRODUCT_NAME = BootCache;
+ SDKROOT = macosx;
SECTORDER_FLAGS = "";
};
name = Default;
Only in BootCache-110.2/BootCache.xcodeproj: project.xcworkspace
Only in BootCache-110.2/BootCache.xcodeproj: xcuserdata
98 changes: 98 additions & 0 deletions libutil-38.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
Binary files libutil-38/.DS_Store and libutil-38/.DS_Store differ
diff -ru libutil-38.2/getmntopts.c libutil-38/getmntopts.c
--- libutil-38/getmntopts.c 2011-09-20 19:38:36.000000000 -0400
+++ libutil-38/getmntopts.c 2016-05-19 01:44:02.000000000 -0400
@@ -46,7 +46,7 @@
#include <stdlib.h>
#include <string.h>

-#include <mntopts.h>
+#include "mntopts.h"

int getmnt_silent = 0;

diff -ru libutil-38/humanize_number.c libutil-38/humanize_number.c
--- libutil-38/humanize_number.c 2010-03-17 17:30:43.000000000 -0400
+++ libutil-38/humanize_number.c 2016-05-19 01:44:02.000000000 -0400
@@ -45,7 +45,7 @@
#include <stdlib.h>
#include <string.h>
#include <locale.h>
-#include <libutil.h>
+#include "libutil.h"
#include <stdint.h>
#include <limits.h>

diff -ru libutil-38/libutil.xcodeproj/project.pbxproj libutil-38/libutil.xcodeproj/project.pbxproj
--- libutil-38/libutil.xcodeproj/project.pbxproj 2014-01-07 17:39:33.000000000 -0500
+++ libutil-38/libutil.xcodeproj/project.pbxproj 2016-05-19 01:41:47.000000000 -0400
@@ -315,7 +315,7 @@
BA79F99713BB70D7006A292D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0640;
};
buildConfigurationList = BA79F99A13BB70D7006A292D /* Build configuration list for PBXProject "libutil" */;
compatibilityVersion = "Xcode 3.2";
@@ -419,6 +419,7 @@
baseConfigurationReference = 3F09C378186D1F73007AF93C /* base.xcconfig */;
buildSettings = {
APPLY_RULES_IN_COPY_FILES = YES;
+ ONLY_ACTIVE_ARCH = YES;
"PLIST_FILE_OUTPUT_FORMAT[sdk=iphoneos*]" = binary;
"PLIST_FILE_OUTPUT_FORMAT[sdk=macosx*]" = XML;
USE_HEADERMAP = NO;
@@ -439,7 +440,7 @@
BA79F9C813BB718B006A292D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1.0;
DYLIB_CURRENT_VERSION = 1.0;
EXECUTABLE_PREFIX = lib;
@@ -462,7 +463,7 @@
BA79F9C913BB718B006A292D /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
DYLIB_COMPATIBILITY_VERSION = 1.0;
DYLIB_CURRENT_VERSION = 1.0;
EXECUTABLE_PREFIX = lib;
Only in libutil-38/libutil.xcodeproj/project.xcworkspace: xcuserdata
Only in libutil-38/libutil.xcodeproj: xcuserdata
diff -ru libutil-38/pidfile.c libutil-38/pidfile.c
--- libutil-38/pidfile.c 2006-05-18 17:16:17.000000000 -0400
+++ libutil-38/pidfile.c 2016-05-19 01:44:00.000000000 -0400
@@ -37,7 +37,7 @@
#include <string.h>
#include <err.h>
#include <errno.h>
-#include <libutil.h>
+#include "libutil.h"

static int _pidfile_remove(struct pidfh *pfh, int freeit);

diff -ru libutil-38.2/trimdomain.c libutil-38/trimdomain.c
--- libutil-38/trimdomain.c 2011-09-19 19:42:32.000000000 -0400
+++ libutil-38/trimdomain.c 2016-05-19 01:45:19.000000000 -0400
@@ -30,7 +30,7 @@

#include <sys/param.h>

-#include <libutil.h>
+#include "libutil.h"
#include <string.h>
#include <unistd.h>

diff -ru libutil-38/xcconfigs/tzlinkd.xcconfig libutil-38/xcconfigs/tzlinkd.xcconfig
--- libutil-38/xcconfigs/tzlinkd.xcconfig 2014-01-06 15:39:44.000000000 -0500
+++ libutil-38/xcconfigs/tzlinkd.xcconfig 2016-05-19 01:43:18.000000000 -0400
@@ -1,4 +1,4 @@
-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/SimulatorSupport.xcconfig"
+#include "<DEVELOPER_DIR>/XcodeConfig/SimulatorSupport.xcconfig"

// Set INSTALL_PATH_ACTUAL to whatever INSTALL_PATH would normally be
INSTALL_PATH_ACTUAL = /usr/sbin
76 changes: 76 additions & 0 deletions network_cmds-457.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
Binary files network_cmds-457.orig/.DS_Store and network_cmds-457/.DS_Store differ
diff -ru network_cmds-457.orig/netstat.tproj/if.c network_cmds-457/netstat.tproj/if.c
--- network_cmds-457.orig/netstat.tproj/if.c 2014-06-23 20:35:20.000000000 -0400
+++ network_cmds-457/netstat.tproj/if.c 2016-05-20 17:53:17.000000000 -0400
@@ -1719,8 +1719,8 @@
sfb->allocation, sfb->dropthresh);
printf(" [ flow controlled: %7llu adv feedback: %10llu ]\n",
sp->flow_controlled, sp->flow_feedback);
- printf(" [ min queue delay: %10s delay_fcthreshold: %12llu]\n "
- " [stalls: %12lu]\n",
+ printf(" [ min queue delay: %10s delay_fcthreshold: %12u"
+ " [stalls: %12llu]\n",
nsec_to_str(sfb->min_estdelay), sfb->delay_fcthreshold,
sp->dequeue_stall);

diff -ru network_cmds-457.orig/network_cmds.xcodeproj/project.pbxproj network_cmds-457/network_cmds.xcodeproj/project.pbxproj
--- network_cmds-457.orig/network_cmds.xcodeproj/project.pbxproj 2014-06-27 01:18:42.000000000 -0400
+++ network_cmds-457/network_cmds.xcodeproj/project.pbxproj 2016-05-20 17:52:26.000000000 -0400
@@ -3640,7 +3640,7 @@
METAL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx.internal;
+ SDKROOT = macosx10.10;
};
name = Debug;
};
@@ -3673,7 +3673,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.10;
METAL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx.internal;
+ SDKROOT = macosx10.10;
};
name = Release;
};
@@ -3706,7 +3706,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.10;
METAL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
- SDKROOT = macosx.internal;
+ SDKROOT = macosx10.10;
};
name = "Ignore Me";
};
@@ -4831,6 +4831,7 @@
7200F3001958A34D0033E22C /* Ignore Me */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
7216D24B0EE896EC00AE70E4 /* Build configuration list for PBXNativeTarget "netstat" */ = {
isa = XCConfigurationList;
Only in network_cmds-457/network_cmds.xcodeproj: project.xcworkspace
Only in network_cmds-457/network_cmds.xcodeproj: xcuserdata
diff -ru network_cmds-457.orig/rtadvd.tproj/rtadvd.c network_cmds-457/rtadvd.tproj/rtadvd.c
--- network_cmds-457.orig/rtadvd.tproj/rtadvd.c 2013-03-04 18:56:46.000000000 -0500
+++ network_cmds-457/rtadvd.tproj/rtadvd.c 2016-05-20 17:53:42.000000000 -0400
@@ -1118,7 +1118,7 @@
preferred_time += now.tv_sec;

if (!pp->timer && rai->clockskew &&
- abs(preferred_time - pp->pltimeexpire) > rai->clockskew) {
+ labs(preferred_time - pp->pltimeexpire) > rai->clockskew) {
syslog(LOG_INFO,
"<%s> preferred lifetime for %s/%d"
" (decr. in real time) inconsistent on %s:"
@@ -1154,7 +1154,7 @@
valid_time += now.tv_sec;

if (!pp->timer && rai->clockskew &&
- abs(valid_time - pp->vltimeexpire) > rai->clockskew) {
+ labs(valid_time - pp->vltimeexpire) > rai->clockskew) {
syslog(LOG_INFO,
"<%s> valid lifetime for %s/%d"
" (decr. in real time) inconsistent on %s:"

0 comments on commit 46291c3

Please sign in to comment.