FS-4071 --resolve

diff --git a/libs/ldns/install-sh b/libs/ldns/install-sh
index 6781b987bdbcbc23efe6bbe1654a1e3637b9af07..a9244eb0786534553fdd9eb0050bb4b172bad0a3 100755 (executable)
--- a/libs/ldns/install-sh
+++ b/libs/ldns/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+       # Protect names problematic for `test' and other utilities.
+       case $dst_arg in
+         -* | [=\(\)!]) dst_arg=./$dst_arg;;
+       esac
        shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
        /*) prefix='/';;
-       -*) prefix='./';;
+       [-=\(\)!]*) prefix='./';;
        *)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-       test -z "$d" && continue
+       test X"$d" = X && continue
 
        prefix=$prefix$d
        if test -d "$prefix"; then

diff --git a/libs/libnatpmp/natpmp.c b/libs/libnatpmp/natpmp.c
index d4b9dcbe31f1f9b2a66d0242aa2b8b534d718cb0..c79e92bdfd320c1c2adc5462d77097bd69133c45 100644 (file)
--- a/libs/libnatpmp/natpmp.c
+++ b/libs/libnatpmp/natpmp.c
@@ -165,15 +165,22 @@ int sendnewportmappingrequest(natpmp_t * p, int protocol,
                               uint16_t privateport, uint16_t publicport,
                                                          uint32_t lifetime)
 {
+       uint16_t *n;
+       uint32_t *m;
+
        if(!p || (protocol!=NATPMP_PROTOCOL_TCP && protocol!=NATPMP_PROTOCOL_UDP))
                return NATPMP_ERR_INVALIDARGS;
        p->pending_request[0] = 0;
        p->pending_request[1] = (char)protocol;
        p->pending_request[2] = 0;
        p->pending_request[3] = 0;
-       *((uint16_t *)(intptr_t)(p->pending_request + 4)) = htons(privateport);
-       *((uint16_t *)(intptr_t)(p->pending_request + 6)) = htons(publicport);
-       *((uint32_t *)(intptr_t)(p->pending_request + 8)) = htonl(lifetime);
+       n = (uint16_t *)(p->pending_request + 4); *n = htons(privateport);
+       n = (uint16_t *)(p->pending_request + 6); *n = htons(publicport);
+       m = (uint32_t *)(p->pending_request + 8); *m = htonl(lifetime);
+
+       //*((uint16_t *)(p->pending_request + 4)) = htons(privateport);
+       //*((uint16_t *)(p->pending_request + 6)) = htons(publicport);
+       //*((uint32_t *)(p->pending_request + 8)) = htonl(lifetime);
        p->pending_request_len = 12;
        return sendnatpmprequest(p);
 }

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index c35540c4f54f599f0bd31604466ffe78037e27f1..4c9b84cadf30d8a16344eac7b10d11b22e9bdce5 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Thu Mar  1 10:03:45 CST 2012
+Wed Apr  4 16:17:37 CDT 2012

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
index 523599c7a773f618094a32c38716b35292c6e78e..c1c4fd23df9b121d9a5f1fcb26d708b8fe1caf93 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
@@ -409,8 +409,10 @@ static int
 li_scope6(struct in6_addr const *ip6)
 {
   if (IN6_IS_ADDR_V4MAPPED(ip6) || IN6_IS_ADDR_V4COMPAT(ip6)) {
-    uint32_t ip4 = *(uint32_t *)(ip6->s6_addr + 12);
-    return li_scope4(ip4);
+         uint32_t *u = (uint32_t *)(ip6->s6_addr + 12);
+
+         uint32_t ip4 = *u;
+         return li_scope4(ip4);
   }
   else if (IN6_IS_ADDR_LOOPBACK(ip6))
     return LI_SCOPE_HOST;