From eda7f10a4f2319bce9e6ffe5b51e53371517a373 Mon Sep 17 00:00:00 2001 From: Apple Date: Mon, 8 Jun 2015 21:56:45 +0000 Subject: [PATCH] libresolv-60.tar.gz --- res_send.c | 1 + xcodescripts/headers.sh | 1 - xcodescripts/libresolv.xcconfig | 8 +++----- xcodescripts/links.sh | 2 -- xcodescripts/manpages.sh | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/res_send.c b/res_send.c index 38ac60b..a28b9f4 100644 --- a/res_send.c +++ b/res_send.c @@ -177,6 +177,7 @@ bind_random(int sock) /* random port in the range RANDOM_BIND_FIRST to RANDOM_BIND_LAST */ src_port = (res_randomid() % (RANDOM_BIND_LAST - RANDOM_BIND_FIRST)) + RANDOM_BIND_FIRST; memset(&local, 0, sizeof(struct sockaddr_in)); + local.sin_family = AF_INET; local.sin_port = htons(src_port); status = bind(sock, (struct sockaddr *)&local, sizeof(struct sockaddr_in)); diff --git a/xcodescripts/headers.sh b/xcodescripts/headers.sh index 3021aae..ee06b70 100644 --- a/xcodescripts/headers.sh +++ b/xcodescripts/headers.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e -x -DSTROOT="$DSTROOT$INSTALL_PATH_PREFIX" DIR="$DSTROOT"/usr/include/arpa install -d -m 0755 -o "$INSTALL_OWNER" -g "$INSTALL_GROUP" \ "$DIR" diff --git a/xcodescripts/libresolv.xcconfig b/xcodescripts/libresolv.xcconfig index c34fec3..0ff1cce 100644 --- a/xcodescripts/libresolv.xcconfig +++ b/xcodescripts/libresolv.xcconfig @@ -1,16 +1,14 @@ #include "/Makefiles/CoreOS/Xcode/BSD.xcconfig" -#include "/AppleInternal/XcodeConfig/SimulatorSupport.xcconfig" PRODUCT_NAME = $(TARGET_NAME).$(FRAMEWORK_VERSION) DEBUG_INFORMATION_FORMAT = dwarf-with-dsym CODE_SIGN_IDENTITY = - PROVISIONING_PROFILE = -INSTALL_PATH_ACTUAL = /usr/lib -INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_ACTUAL) +INSTALL_PATH = /usr/lib COPY_PHASE_STRIP = YES FRAMEWORK_VERSION = 9 -PRIVATE_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include -PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/include +PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include +PUBLIC_HEADERS_FOLDER_PATH = /usr/include ALWAYS_SEARCH_USER_PATHS = NO OTHER_CFLAGS = -fno-common WARNING_CFLAGS = -Wall diff --git a/xcodescripts/links.sh b/xcodescripts/links.sh index 926a231..151c4e3 100644 --- a/xcodescripts/links.sh +++ b/xcodescripts/links.sh @@ -3,8 +3,6 @@ set -e -x if [ "$ACTION" = installhdrs ]; then exit 0; fi -DSTROOT="$DSTROOT$INSTALL_PATH_PREFIX" - LIBDIR="$DSTROOT"/usr/lib ln -s libresolv.9.dylib "$LIBDIR"/libresolv.dylib chown -h "$INSTALL_OWNER:$INSTALL_GROUP" "$LIBDIR"/libresolv.dylib diff --git a/xcodescripts/manpages.sh b/xcodescripts/manpages.sh index 4f3ed9c..f0c9072 100644 --- a/xcodescripts/manpages.sh +++ b/xcodescripts/manpages.sh @@ -3,7 +3,7 @@ set -e -x # don't install man pages for installhdrs or iOS builds if [ "$ACTION" = installhdrs ]; then exit 0; fi -if [ "${PLATFORM_NAME/iphone/}" != "${PLATFORM_NAME}" ]; then exit 0; fi +if [ "${PLATFORM_NAME}" != "macosx" ]; then exit 0; fi MANDIR="$DSTROOT"/usr/share/man -- 2.47.2