ports/127570: [maintainer] net/siproxd -- update to 0.7.1

Frank W. Josellis frank at dynamical-systems.org
Tue Sep 23 11:50:01 UTC 2008


>Number:         127570
>Category:       ports
>Synopsis:       [maintainer] net/siproxd -- update to 0.7.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 23 11:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Frank W. Josellis
>Release:        FreeBSD 6.3-STABLE i386
>Organization:
>Environment:

	
>Description:
Update to current version 0.7.1.

Removed files:
files/patch-src__plugin_shortdial.c
files/patch-src_auth.c
files/patch-src_sip_utils.c

Added files:
files/patch-aclocal.m4
files/patch-configure
files/patch-libltdl_aclocal.m4
files/patch-libltdl_configure
pkg-plist


>How-To-Repeat:
	
>Fix:

	

--- siproxd-0.7.1.patch begins here ---
diff -Nur siproxd.BAK/Makefile siproxd/Makefile
--- siproxd.BAK/Makefile	2008-08-29 23:22:11.000000000 +0200
+++ siproxd/Makefile	2008-09-23 12:28:22.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	siproxd
-PORTVERSION=	0.7.0
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	net
 MASTER_SITES=	SF
 
@@ -24,7 +23,6 @@
 PORTDOCS2=	FAQ KNOWN_BUGS RFC3261_compliance.txt \
 		sample_cfg_budgetone.txt sample_cfg_x-lite.txt
 PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
-PLIST_FILES=	etc/siproxd.conf.example etc/siproxd_passwd.cfg sbin/siproxd
 
 .include <bsd.port.pre.mk>
 
@@ -32,6 +30,10 @@
 .if ${OSVERSION} >= 500041
 	@${REINPLACE_CMD} -e 's,-lgnugetopt,,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
+.if !defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
+	${WRKSRC}/doc/siproxd.conf.example
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -Nur siproxd.BAK/distinfo siproxd/distinfo
--- siproxd.BAK/distinfo	2008-02-09 23:08:44.000000000 +0100
+++ siproxd/distinfo	2008-09-23 12:28:22.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (siproxd-0.7.0.tar.gz) = 6c978eef0d00160e50073e2e2fd8c23d
-SHA256 (siproxd-0.7.0.tar.gz) = 7990635f34b93771f842e59afda7babeeb0bf4ad244f4bd4a09ffb59ca9af7a3
-SIZE (siproxd-0.7.0.tar.gz) = 243493
+MD5 (siproxd-0.7.1.tar.gz) = 45e5a44803181e2bf3361d562060c904
+SHA256 (siproxd-0.7.1.tar.gz) = 5eef70f4e0a8f0f4628550807da3036f8b3086864bf4bcf5ab6d22ac3a6efd81
+SIZE (siproxd-0.7.1.tar.gz) = 816613
diff -Nur siproxd.BAK/files/patch-aclocal.m4 siproxd/files/patch-aclocal.m4
--- siproxd.BAK/files/patch-aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ siproxd/files/patch-aclocal.m4	2008-09-23 12:28:22.000000000 +0200
@@ -0,0 +1,11 @@
+--- aclocal.m4.orig	2008-03-09 14:35:51.000000000 +0100
++++ aclocal.m4	2008-09-23 11:23:56.000000000 +0200
+@@ -1276,7 +1276,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
diff -Nur siproxd.BAK/files/patch-configure siproxd/files/patch-configure
--- siproxd.BAK/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ siproxd/files/patch-configure	2008-09-23 12:28:22.000000000 +0200
@@ -0,0 +1,38 @@
+--- configure.orig	2008-03-09 14:35:57.000000000 +0100
++++ configure	2008-09-23 11:25:19.000000000 +0200
+@@ -8063,7 +8063,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -11733,7 +11733,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -14867,7 +14867,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -17197,7 +17197,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
diff -Nur siproxd.BAK/files/patch-doc_siproxd.conf.example siproxd/files/patch-doc_siproxd.conf.example
--- siproxd.BAK/files/patch-doc_siproxd.conf.example	2008-01-30 18:31:22.000000000 +0100
+++ siproxd/files/patch-doc_siproxd.conf.example	2008-09-23 12:28:22.000000000 +0200
@@ -1,5 +1,5 @@
---- doc/siproxd.conf.example.orig	Thu Aug 16 20:57:04 2007
-+++ doc/siproxd.conf.example	Wed Nov 14 12:26:19 2007
+--- doc/siproxd.conf.example.orig	2008-05-17 17:56:11.000000000 +0200
++++ doc/siproxd.conf.example	2008-09-23 12:03:33.000000000 +0200
 @@ -17,8 +17,8 @@
  #    or a hostname that resolves to that address (use a dyndns address for
  #    example).
@@ -11,16 +11,16 @@
  # uncomment the following line ONLY IF YOU KNOW WHAT YOU ARE DOING!
  # READ THE FAQ FIRST!
  #host_outbound = 1.2.3.4
-@@ -84,7 +84,7 @@
+@@ -79,7 +79,7 @@
  #   user:	uid/gid to switch to after startup
  #   chrootjail:	path to chroot to (chroot jail)
  user = nobody
 -#chrootjail = /var/lib/siproxd/
-+chrootjail = /usr/local/siproxd/
++chrootjail = %%PREFIX%%/siproxd/
  
  ######################################################################
  # Registration file:
-@@ -93,7 +93,7 @@
+@@ -88,7 +88,7 @@
  #   the specified directory path does exist!
  #   Note: If running in chroot jail, this path starts relative
  #         to the jail.
@@ -29,7 +29,7 @@
  
  ######################################################################
  # Automatically save current registrations every 'n' seconds
-@@ -106,7 +106,7 @@
+@@ -101,7 +101,7 @@
  #   This file holds the PID of the main thread of siproxd.
  #   Note: If running in chroot jail, this path starts relative
  #         to the jail.
@@ -38,3 +38,12 @@
  
  ######################################################################
  # global switch to control the RTP proxy behaviour
+@@ -286,7 +286,7 @@
+ # the processing order is given by the load order.
+ #
+ # plugin_dir: MUST be terminated with '/'
+-plugindir=/home/hb9xar/src/siproxd/src/.libs/
++plugindir=%%PREFIX%%/lib/siproxd/
+ #
+ # List of plugins to load:
+ #load_plugin=plugin_demo.so
diff -Nur siproxd.BAK/files/patch-libltdl_aclocal.m4 siproxd/files/patch-libltdl_aclocal.m4
--- siproxd.BAK/files/patch-libltdl_aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ siproxd/files/patch-libltdl_aclocal.m4	2008-09-23 12:28:22.000000000 +0200
@@ -0,0 +1,11 @@
+--- libltdl/aclocal.m4.orig	2008-02-02 18:16:08.000000000 +0100
++++ libltdl/aclocal.m4	2008-09-23 11:26:47.000000000 +0200
+@@ -1276,7 +1276,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
diff -Nur siproxd.BAK/files/patch-libltdl_configure siproxd/files/patch-libltdl_configure
--- siproxd.BAK/files/patch-libltdl_configure	1970-01-01 01:00:00.000000000 +0100
+++ siproxd/files/patch-libltdl_configure	2008-09-23 12:28:22.000000000 +0200
@@ -0,0 +1,38 @@
+--- libltdl/configure.orig	2008-02-02 18:16:08.000000000 +0100
++++ libltdl/configure	2008-09-23 11:28:19.000000000 +0200
+@@ -7954,7 +7954,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -11518,7 +11518,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -14519,7 +14519,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+@@ -16804,7 +16804,7 @@
+   ;;
+ 
+ freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  objformat=elf
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
diff -Nur siproxd.BAK/files/patch-src__plugin_shortdial.c siproxd/files/patch-src__plugin_shortdial.c
--- siproxd.BAK/files/patch-src__plugin_shortdial.c	2008-02-09 23:08:45.000000000 +0100
+++ siproxd/files/patch-src__plugin_shortdial.c	2008-09-23 12:28:22.000000000 +0200
@@ -1,10 +0,0 @@
---- src/plugin_shortdial.c.orig	Sat Jan 19 17:06:51 2008
-+++ src/plugin_shortdial.c	Mon Feb  4 16:46:26 2008
-@@ -23,6 +23,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <netinet/in.h>
- 
- #include <osipparser2/osip_parser.h>
diff -Nur siproxd.BAK/files/patch-src__siproxd.c siproxd/files/patch-src__siproxd.c
--- siproxd.BAK/files/patch-src__siproxd.c	2008-02-09 23:08:45.000000000 +0100
+++ siproxd/files/patch-src__siproxd.c	2008-09-23 12:28:22.000000000 +0200
@@ -1,20 +1,34 @@
---- src/siproxd.c.orig	Sat Jan 19 17:06:51 2008
-+++ src/siproxd.c	Mon Feb  4 16:42:25 2008
-@@ -182,10 +182,15 @@
+--- src/siproxd.c.orig	2008-02-04 21:38:47.000000000 +0100
++++ src/siproxd.c	2008-08-29 19:37:53.000000000 +0200
+@@ -226,8 +226,6 @@
  /*
   * Init stuff
   */
 -   INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
 -
     /* read the config file */
-    if (read_config(configfile, config_search) == STS_FAILURE) exit(1);
-+
+    if (read_config(configfile, config_search, main_cfg_opts, "") == STS_FAILURE) {
+       exit(1);
+@@ -237,6 +235,13 @@
+    configuration.configfile = strdup(configfile);
+    configuration.config_search = config_search;
+ 
 +   /* Don't log to stderr if daemonizing is intended. */
 +   if (configuration.daemonize) {
 +     log_set_stderr(0);
 +   }
 +
 +   INFO(PACKAGE"-"VERSION"-"BUILDSTR" "UNAME" starting up");
- 
++
     /* if a debug level > 0 has been given on the commandline use its
        value and not what is in the config file */
+    if (cmdline_debuglevel != 0) {
+@@ -301,7 +306,7 @@
+     * the jail, too. However, it will be owned by root and not deleted
+     * on process termination... */
+    if (configuration.chrootjail && ((getuid()==0) || (geteuid()==0))) {
+-      if (pidfilename) createpidfile(pidfilename);
++      if (pidfilename && *pidfilename == '/') createpidfile(pidfilename);
+    }
+ 
+    /* change user and group IDs */
diff -Nur siproxd.BAK/files/patch-src_auth.c siproxd/files/patch-src_auth.c
--- siproxd.BAK/files/patch-src_auth.c	2008-03-31 22:35:17.000000000 +0200
+++ siproxd/files/patch-src_auth.c	2008-09-23 12:28:22.000000000 +0200
@@ -1,128 +0,0 @@
---- src/auth.c.orig	2008-01-19 17:07:14.000000000 +0100
-+++ src/auth.c	2008-03-31 10:58:24.000000000 +0200
-@@ -367,25 +367,25 @@
- 		   OUT HASHHEX SessionKey
- 		   )
- {
--  MD5_CTX Md5Ctx;
-+  osip_MD5_CTX Md5Ctx;
-   HASH HA1;
-   
--  MD5Init(&Md5Ctx);
--  if (pszUserName) MD5Update(&Md5Ctx, pszUserName, strlen(pszUserName));
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszRealm)    MD5Update(&Md5Ctx, pszRealm, strlen(pszRealm));
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszPassword) MD5Update(&Md5Ctx, pszPassword, strlen(pszPassword));
--  MD5Final(HA1, &Md5Ctx);
-+  osip_MD5Init(&Md5Ctx);
-+  if (pszUserName) osip_MD5Update(&Md5Ctx, pszUserName, strlen(pszUserName));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszRealm)    osip_MD5Update(&Md5Ctx, pszRealm, strlen(pszRealm));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszPassword) osip_MD5Update(&Md5Ctx, pszPassword, strlen(pszPassword));
-+  osip_MD5Final(HA1, &Md5Ctx);
- 
-   if ((pszAlg!=NULL) && (osip_strcasecmp(pszAlg, "md5-sess") == 0)) {
--    MD5Init(&Md5Ctx);
--    MD5Update(&Md5Ctx, HA1, HASHLEN);
--    MD5Update(&Md5Ctx, ":", 1);
--    if (pszNonce)  MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
--    MD5Update(&Md5Ctx, ":", 1);
--    if (pszCNonce) MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
--    MD5Final(HA1, &Md5Ctx);
-+    osip_MD5Init(&Md5Ctx);
-+    osip_MD5Update(&Md5Ctx, HA1, HASHLEN);
-+    osip_MD5Update(&Md5Ctx, ":", 1);
-+    if (pszNonce)  osip_MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
-+    osip_MD5Update(&Md5Ctx, ":", 1);
-+    if (pszCNonce) osip_MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
-+    osip_MD5Final(HA1, &Md5Ctx);
-   };
-   CvtHex(HA1, SessionKey);
- }
-@@ -403,57 +403,57 @@
- 			OUT HASHHEX Response    /* request-digest or response-digest */
- 			)
- {
--  MD5_CTX Md5Ctx;
-+  osip_MD5_CTX Md5Ctx;
-   HASH HA2;
-   HASH RespHash;
-   HASHHEX HA2Hex;
-   
-   /* calculate H(A2) */
--  MD5Init(&Md5Ctx);
--  if (pszMethod)   MD5Update(&Md5Ctx, pszMethod, strlen(pszMethod));
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszDigestUri)MD5Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri));
-+  osip_MD5Init(&Md5Ctx);
-+  if (pszMethod)   osip_MD5Update(&Md5Ctx, pszMethod, strlen(pszMethod));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszDigestUri)osip_MD5Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri));
-   
-   if (pszQop!=NULL) {
-       goto auth_withqop;
-   };
-   
-   /* auth_withoutqop: */
--  MD5Final(HA2, &Md5Ctx);
-+  osip_MD5Final(HA2, &Md5Ctx);
-   CvtHex(HA2, HA2Hex);
- 
-   /* calculate response */
--  MD5Init(&Md5Ctx);
--  MD5Update(&Md5Ctx, HA1, HASHHEXLEN);
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszNonce)    MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
--  MD5Update(&Md5Ctx, ":", 1);
-+  osip_MD5Init(&Md5Ctx);
-+  osip_MD5Update(&Md5Ctx, HA1, HASHHEXLEN);
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszNonce)    osip_MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
- 
-   goto end;
- 
-  auth_withqop:
- 
--  MD5Update(&Md5Ctx, ":", 1);
--  MD5Update(&Md5Ctx, HEntity, HASHHEXLEN);
--  MD5Final(HA2, &Md5Ctx);
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  osip_MD5Update(&Md5Ctx, HEntity, HASHHEXLEN);
-+  osip_MD5Final(HA2, &Md5Ctx);
-   CvtHex(HA2, HA2Hex);
- 
-   /* calculate response */
--  MD5Init(&Md5Ctx);
--  MD5Update(&Md5Ctx, HA1, HASHHEXLEN);
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszNonce)    MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszNonceCount)MD5Update(&Md5Ctx, pszNonceCount, strlen(pszNonceCount));
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszCNonce)   MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
--  MD5Update(&Md5Ctx, ":", 1);
--  if (pszQop)      MD5Update(&Md5Ctx, pszQop, strlen(pszQop));
--  MD5Update(&Md5Ctx, ":", 1);
-+  osip_MD5Init(&Md5Ctx);
-+  osip_MD5Update(&Md5Ctx, HA1, HASHHEXLEN);
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszNonce)    osip_MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszNonceCount)osip_MD5Update(&Md5Ctx, pszNonceCount, strlen(pszNonceCount));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszCNonce)   osip_MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
-+  if (pszQop)      osip_MD5Update(&Md5Ctx, pszQop, strlen(pszQop));
-+  osip_MD5Update(&Md5Ctx, ":", 1);
- 
-  end:
--  MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN);
--  MD5Final(RespHash, &Md5Ctx);
-+  osip_MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN);
-+  osip_MD5Final(RespHash, &Md5Ctx);
-   CvtHex(RespHash, Response);
- }
- 
diff -Nur siproxd.BAK/files/patch-src_sip_utils.c siproxd/files/patch-src_sip_utils.c
--- siproxd.BAK/files/patch-src_sip_utils.c	2008-03-31 22:35:17.000000000 +0200
+++ siproxd/files/patch-src_sip_utils.c	2008-09-23 12:28:22.000000000 +0200
@@ -1,83 +0,0 @@
---- src/sip_utils.c.orig	2008-01-19 17:07:14.000000000 +0100
-+++ src/sip_utils.c	2008-03-31 10:58:24.000000000 +0200
-@@ -773,13 +773,13 @@
-       if (strncmp(param->gvalue, magic_cookie,
-                   strlen(magic_cookie))==0) {
-          /* calculate MD5 hash */
--         MD5_CTX Md5Ctx;
-+         osip_MD5_CTX Md5Ctx;
-          HASH HA1;
- 
--         MD5Init(&Md5Ctx);
--         MD5Update(&Md5Ctx, param->gvalue,
-+         osip_MD5Init(&Md5Ctx);
-+         osip_MD5Update(&Md5Ctx, param->gvalue,
-                    strlen(param->gvalue));
--         MD5Final(HA1, &Md5Ctx);
-+         osip_MD5Final(HA1, &Md5Ctx);
-          CvtHex(HA1, hashstring);
- 
-          DEBUGC(DBCLASS_BABBLE, "existing branch -> branch hash [%s]",
-@@ -799,53 +799,53 @@
-     */
-    if (hashstring[0] == '\0') {
-       /* calculate MD5 hash */
--      MD5_CTX Md5Ctx;
-+      osip_MD5_CTX Md5Ctx;
-       HASH HA1;
-       char *tmp;
- 
--      MD5Init(&Md5Ctx);
-+      osip_MD5Init(&Md5Ctx);
- 
-       /* topmost via */
-       osip_via_to_str(via, &tmp);
-       if (tmp) {
--         MD5Update(&Md5Ctx, tmp, strlen(tmp));
-+         osip_MD5Update(&Md5Ctx, tmp, strlen(tmp));
-          osip_free(tmp);
-       }
-      
-       /* Tag in To header */
-       osip_to_get_tag(sip_msg->to, &param);
-       if (param && param->gvalue) {
--         MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue));
-+         osip_MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue));
-       }
- 
-       /* Tag in From header */
-       osip_from_get_tag(sip_msg->from, &param);
-       if (param && param->gvalue) {
--         MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue));
-+         osip_MD5Update(&Md5Ctx, param->gvalue, strlen(param->gvalue));
-       }
- 
-       /* Call-ID */
-       call_id = osip_message_get_call_id(sip_msg);
-       osip_call_id_to_str(call_id, &tmp);
-       if (tmp) {
--         MD5Update(&Md5Ctx, tmp, strlen(tmp));
-+         osip_MD5Update(&Md5Ctx, tmp, strlen(tmp));
-          osip_free(tmp);
-       }
- 
-       /* CSeq number (but not method) */
-       tmp = osip_cseq_get_number(sip_msg->cseq);
-       if (tmp) {
--         MD5Update(&Md5Ctx, tmp, strlen(tmp));
-+         osip_MD5Update(&Md5Ctx, tmp, strlen(tmp));
-       }
-  
-       /* Request URI */
-       osip_uri_to_str(sip_msg->req_uri, &tmp);
-       if (tmp) {
--         MD5Update(&Md5Ctx, tmp, strlen(tmp));
-+         osip_MD5Update(&Md5Ctx, tmp, strlen(tmp));
-          osip_free(tmp);
-       }
- 
--      MD5Final(HA1, &Md5Ctx);
-+      osip_MD5Final(HA1, &Md5Ctx);
-       CvtHex(HA1, hashstring);
- 
-       DEBUGC(DBCLASS_BABBLE, "non-existing branch -> branch hash [%s]",
diff -Nur siproxd.BAK/pkg-plist siproxd/pkg-plist
--- siproxd.BAK/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ siproxd/pkg-plist	2008-09-23 12:28:22.000000000 +0200
@@ -0,0 +1,24 @@
+etc/siproxd.conf.example
+etc/siproxd_passwd.cfg
+lib/siproxd/plugin_defaulttarget.a
+lib/siproxd/plugin_defaulttarget.la
+lib/siproxd/plugin_defaulttarget.so
+lib/siproxd/plugin_defaulttarget.so.0
+lib/siproxd/plugin_demo.a
+lib/siproxd/plugin_demo.la
+lib/siproxd/plugin_demo.so
+lib/siproxd/plugin_demo.so.0
+lib/siproxd/plugin_fix_bogus_via.a
+lib/siproxd/plugin_fix_bogus_via.la
+lib/siproxd/plugin_fix_bogus_via.so
+lib/siproxd/plugin_fix_bogus_via.so.0
+lib/siproxd/plugin_logcall.a
+lib/siproxd/plugin_logcall.la
+lib/siproxd/plugin_logcall.so
+lib/siproxd/plugin_logcall.so.0
+lib/siproxd/plugin_shortdial.a
+lib/siproxd/plugin_shortdial.la
+lib/siproxd/plugin_shortdial.so
+lib/siproxd/plugin_shortdial.so.0
+sbin/siproxd
+ at dirrm lib/siproxd
--- siproxd-0.7.1.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list