libresolv-60.tar.gz

diff --git a/res_send.c b/res_send.c
index 38ac60bd1145fe94e49c1f1363658a48a7af2d67..a28b9f476aa6d120116a967130cd74fc6c4751f9 100644 (file)
--- 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));
                /* 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));
                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 3021aae60fc6bc909cabb897a87b769eb5eb7905..ee06b70cc36567437e0ef34425c9bcfa8fbe1a49 100644 (file)
--- a/xcodescripts/headers.sh
+++ b/xcodescripts/headers.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e -x
 
 #!/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"
 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 c34fec39ee7a5a099cbbeb0ec8b41337cb10ce02..0ff1cce52ffc3c2716846baa4d9483c0db0a5e92 100644 (file)
--- a/xcodescripts/libresolv.xcconfig
+++ b/xcodescripts/libresolv.xcconfig
@@ -1,16 +1,14 @@
 #include "<DEVELOPER_DIR>/Makefiles/CoreOS/Xcode/BSD.xcconfig"
 #include "<DEVELOPER_DIR>/Makefiles/CoreOS/Xcode/BSD.xcconfig"

-#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/SimulatorSupport.xcconfig"

 
 PRODUCT_NAME = $(TARGET_NAME).$(FRAMEWORK_VERSION)
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
 CODE_SIGN_IDENTITY = -
 PROVISIONING_PROFILE =
 
 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
 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
 ALWAYS_SEARCH_USER_PATHS = NO
 OTHER_CFLAGS = -fno-common
 WARNING_CFLAGS = -Wall

diff --git a/xcodescripts/links.sh b/xcodescripts/links.sh
index 926a23136d3bd2b9caa4884f580c0ca53e72c01e..151c4e3a1b4a3fb3a058caf615a756c802bf3513 100644 (file)
--- a/xcodescripts/links.sh
+++ b/xcodescripts/links.sh
@@ -3,8 +3,6 @@ set -e -x
 
 if [ "$ACTION" = installhdrs ]; then exit 0; fi
 
 
 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
 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 4f3ed9ca3ecdfc55cd8e0f07e87608264d376fdb..f0c907244aa6cca1f3036080829631c8654da9df 100644 (file)
--- 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
 
 # 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
 
 
 MANDIR="$DSTROOT"/usr/share/man