diff options
-rw-r--r-- | net/sipxtacklib/Makefile | 8 | ||||
-rw-r--r-- | net/sipxtacklib/files/patch-src_net_HttpMessage.cpp | 15 |
2 files changed, 16 insertions, 7 deletions
diff --git a/net/sipxtacklib/Makefile b/net/sipxtacklib/Makefile index 9ac90409392d..f0df6e59f8f6 100644 --- a/net/sipxtacklib/Makefile +++ b/net/sipxtacklib/Makefile @@ -41,10 +41,4 @@ post-patch: @${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/siptest/src/siptest/subscribe-dialog-test @${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/syslog2siptrace/merge-logs -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/sipxtacklib/files/patch-src_net_HttpMessage.cpp b/net/sipxtacklib/files/patch-src_net_HttpMessage.cpp new file mode 100644 index 000000000000..a15bd05eab18 --- /dev/null +++ b/net/sipxtacklib/files/patch-src_net_HttpMessage.cpp @@ -0,0 +1,15 @@ +--- src/net/HttpMessage.cpp.orig Sat Sep 29 15:57:14 2007 ++++ src/net/HttpMessage.cpp Sat Sep 29 15:59:10 2007 +@@ -3304,10 +3304,10 @@ + decodedCookie); + #endif + // Parse out the userId and password +- int userPasswordSeparatorIndex = (int) strchr(decodedCookie, ':'); ++ uintptr_t userPasswordSeparatorIndex = (uintptr_t) strchr(decodedCookie, ':'); + if(userPasswordSeparatorIndex) + { +- userPasswordSeparatorIndex -= (int) decodedCookie; ++ userPasswordSeparatorIndex -= (uintptr_t) decodedCookie; + + userId->append(decodedCookie, userPasswordSeparatorIndex); + password->append(&decodedCookie[userPasswordSeparatorIndex + 1], |