diff -r bb40ee892364 -r a2c6460cfb16 opensips/opensips.spec --- a/opensips/opensips.spec Sun Jan 27 20:22:45 2013 +0100 +++ b/opensips/opensips.spec Mon Jan 28 17:37:18 2013 +0100 @@ -387,16 +387,14 @@ modules/sipcapture/sipcapture.h \ modules/lua/sipwatch.h \ modules/lua/crc32.h + # redundant since OpenSIPS commit #9666 (ab 1.9.*) %{l_shtool} subst \ - -e 's;\(LM_ERR("\)\(failed to retrieve SO_ERROR (%d) %s\\n",\);\1addr (%s) port (%d), \2 inet_ntoa(((struct sockaddr_in *)servaddr)->sin_addr), ntohs(((struct sockaddr_in *)servaddr)->sin_port),;' \ + -e 's/\(LM_ERR("\)\(failed to retrieve SO_ERROR (%d) %s\\n",\)/char erraddrstr[INET6_ADDRSTRLEN]; \1addr (%s) port (%d), \2 servaddr->sa_family == AF_INET ? inet_ntoa(((struct sockaddr_in *)servaddr)->sin_addr) : inet_ntop(AF_INET6, \&((struct sockaddr_in6 *)servaddr)->sin6_addr, erraddrstr, sizeof(erraddrstr)), servaddr->sa_family == AF_INET ? ntohs(((struct sockaddr_in *)servaddr)->sin_port) : ntohs(((struct sockaddr_in6 *)servaddr)->sin6_port),/' \ tcp_main.c %{l_shtool} subst \ -e 's;\(sock_info->socket = socket(AF2PF(addr->s.sa_family), SOCK_SEQPACKET,\) 0;\1 IPPROTO_SCTP;' \ sctp_server.c %{l_shtool} subst \ - -e 's;\(#define MAX_SSL_RETRIES\) 32;\1 1024;' \ - tls/tls_server.c - %{l_shtool} subst \ -e 's;LM_ERR(\("unable to load\);LM_WARN(\1;g' \ tls/tls_init.c %{l_shtool} subst \