20 files changed, 595 insertions, 0 deletions

diff --git a/net/Makefile b/net/Makefile
index 8c7970551b34..a27e3bcca900 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -744,6 +744,7 @@
     SUBDIR += sipp
     SUBDIR += siproxd
     SUBDIR += sipsak
+    SUBDIR += sipxcommserverlib
     SUBDIR += sipxportlib
     SUBDIR += sipxtacklib
     SUBDIR += sixxs-aiccu
diff --git a/net/sipxcommserverlib/Makefile b/net/sipxcommserverlib/Makefile
new file mode 100644
index 000000000000..bfec298b9206
--- /dev/null
+++ b/net/sipxcommserverlib/Makefile
@@ -0,0 +1,50 @@
+# Ports collection makefile for: sipxcommserverlib
+# Date created: Jan 8, 2007
+# Whom: Michael Durian <durian@shadetreesoftware.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	sipxcommserverlib
+PORTVERSION=	3.6.0
+CATEGORIES=	net
+MASTER_SITES=	http://www.sipfoundry.org/pub/sipX/3.6/SRC/
+
+MAINTAINER=	durian@shadetreesoftware.com
+COMMENT=	sipX library for communications between components
+
+LIB_DEPENDS=	sipXport:${PORTSDIR}/net/sipxportlib \
+		sipXtack:${PORTSDIR}/net/sipxtacklib \
+		wwwssl:${PORTSDIR}/www/libwww \
+		xerces-c:${PORTSDIR}/textproc/xerces-c2 \
+		odbc:${PORTSDIR}/databases/unixODBC \
+		pcre.0:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
+		ginstall:${PORTSDIR}/sysutils/coreutils \
+		cppunit-config:${PORTSDIR}/devel/cppunit
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		postmaster:${PORTSDIR}/databases/postgresql81-server
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	autoconf:259:env automake:19:env
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_PERL5_RUN=	yes
+LOCALSTATEDIR=${DESTDIR}/var
+CONFIGURE_ENV+=	wwwdir=${PREFIX}/www/sipX \
+		INSTALL=`which ginstall`
+CONFIGURE_ARGS+=	--enable-sip-tls \
+		--prefix=${PREFIX} \
+		--localstatedir=${LOCALSTATEDIR}
+SUB_LIST=	LOCALSTATEDIR=${LOCALSTATEDIR}
+SUB_FILES=	pkg-deinstall
+
+post-patch:
+	@${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/bin/configpp
+	@${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/bin/sipx-validate-xml.in
+	@${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/bin/pgpatch.sh
+	@${REINPLACE_CMD} -e "s,@PREFIX@,${PREFIX}," ${WRKSRC}/bin/pgpatch.sh
+	@${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/src/sipdbtest/sipdbtest.sh.in
+
+.include <bsd.port.mk>
diff --git a/net/sipxcommserverlib/distinfo b/net/sipxcommserverlib/distinfo
new file mode 100644
index 000000000000..cfd3e0a0101e
--- /dev/null
+++ b/net/sipxcommserverlib/distinfo
@@ -0,0 +1,3 @@
+MD5 (sipxcommserverlib-3.6.0.tar.bz2) = 4d1762cbe32f98f7e145130da59ea95a
+SHA256 (sipxcommserverlib-3.6.0.tar.bz2) = 304683f1dc0a52132112af7c498ee2831d1647ee41a2a615e5630570c4609960
+SIZE (sipxcommserverlib-3.6.0.tar.bz2) = 552182
diff --git a/net/sipxcommserverlib/files/patch-bin_get_def_addr b/net/sipxcommserverlib/files/patch-bin_get_def_addr
new file mode 100644
index 000000000000..181d08ffffa6
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-bin_get_def_addr
@@ -0,0 +1,28 @@
+--- ./bin/get_def_addr.orig	Sun Dec 31 14:18:20 2006
++++ ./bin/get_def_addr	Sun Dec 31 14:23:06 2006
+@@ -1,15 +1,14 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # Get the address of the interface through which our default gateway is reached.
+ # This is very likely to be the correct IP to bind to most of the time.
+ 
+-# 'route -n' prints out something that looks like this.
+-# The interface name of the default route starts at character 73...
+-#Kernel IP routing table
+-#Destination     Gateway         Genmask         Flags Metric Ref    Use Iface
+-#10.1.1.0        0.0.0.0         255.255.255.0   U     0      0        0 eth0
+-#127.0.0.0       0.0.0.0         255.0.0.0       U     0      0        0 lo
+-#0.0.0.0         10.1.1.1        0.0.0.0         UG    0      0        0 eth0
+-
+-IFACE=`/sbin/route -n | grep '^0\\.0\\.0\\.0' | cut -c 73-`
+-/sbin/ifconfig $IFACE | grep "inet addr" | head -n 1 | cut -d: -f 2 | awk '{ print $1 }'
++# 'netstat -nr' prints out something that looks like this.
++#Routing tables
++#
++#Internet:
++#Destination        Gateway            Flags    Refs      Use  Netif Expire
++#default            192.168.1.2        UGS         0  7840565    re0
++#127.0.0.1          127.0.0.1          UH          0  1312935    lo0
++IFACE=`netstat -nr | awk '/^default/ {print $6}'`
++ifconfig $IFACE | grep "inet " | head -n 1 | awk '{print $2}'
diff --git a/net/sipxcommserverlib/files/patch-bin_pgpatch.sh b/net/sipxcommserverlib/files/patch-bin_pgpatch.sh
new file mode 100644
index 000000000000..32eb0a4fd859
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-bin_pgpatch.sh
@@ -0,0 +1,62 @@
+--- bin/pgpatch.sh.orig	Wed Jan  3 14:07:38 2007
++++ bin/pgpatch.sh	Mon Jan  8 16:11:32 2007
+@@ -8,7 +8,7 @@
+ 
+ Action=RUN
+ 
+-: ${ServiceDir:=/etc/init.d}
++: ${ServiceDir:=@PREFIX@/etc/rc.d}
+ : ${Chown:=chown}
+ 
+ # This function determines the correct service name for Postgres.
+@@ -37,19 +37,12 @@
+   Service=`postgresService`
+ 
+   # May not by running, so eat up error (ENG-314)
+-  ${ServiceDir}/${Service} stop 2>&1 1> /dev/null
++  ${ServiceDir}/postgresql stop 2>&1 1> /dev/null
+ 
+   # Custom
+   if test -z $PGDATA
+   then
+-      # Debian/Gentoo
+-      if test -d /var/lib/postgresql/data
+-      then
+-          PGDATA=/var/lib/postgresql/data
+-      else
+-          # Redhat
+-          PGDATA=/var/lib/pgsql/data
+-      fi
++      PGDATA=~pgsql/data
+   fi
+ 
+   # Postgres db is initialized on startup on Redhat, but not on other
+@@ -84,16 +77,16 @@
+   fi
+ 
+   # Open up TCP/IP connections
+-  sed -i-sipx.bak -e 's/\#tcpip_socket\s=\sfalse/tcpip_socket = true/g' \
++  gsed -i-sipx.bak -e 's/\#tcpip_socket\s=\sfalse/tcpip_socket = true/g' \
+           $PGDATA/postgresql.conf
+-  ${Chown} postgres:postgres $PGDATA/postgresql.conf
++  ${Chown} pgsql:pgsql $PGDATA/postgresql.conf
+ 
+   # Postmaster to allow connections
+   echo "-i" > $PGDATA/postmaster.opts.default
+   chmod 664 $PGDATA/postmaster.opts.default
+-  ${Chown} postgres:postgres $PGDATA/postmaster.opts.default
++  ${Chown} pgsql:pgsql $PGDATA/postmaster.opts.default
+ 
+-  ${ServiceDir}/$Service start
++  ${ServiceDir}/postgresql start
+ }
+ 
+ # Have postgres start automatically with system reboot
+@@ -129,7 +122,6 @@
+ if [ ${Action} = RUN ]
+ then
+   postgresSetup
+-  setPostgresRunlevels
+ elif [ ${Action} = HELP ]
+ then
+ cat <<USAGE
diff --git a/net/sipxcommserverlib/files/patch-bin_ssl-cert_check-cert.sh.in b/net/sipxcommserverlib/files/patch-bin_ssl-cert_check-cert.sh.in
new file mode 100644
index 000000000000..686727e324db
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-bin_ssl-cert_check-cert.sh.in
@@ -0,0 +1,11 @@
+--- ./bin/ssl-cert/check-cert.sh.in.orig	Sat Dec 30 16:41:04 2006
++++ ./bin/ssl-cert/check-cert.sh.in	Sat Dec 30 16:41:37 2006
+@@ -216,7 +216,7 @@
+     now=`date +%s`
+     if [ $? -eq 0 ] # date command support epoch format
+     then
+-        exp=`date --date="${cert_expires}" +%s`
++        exp=`date -j -f "%b %d %T %Y %Z" "${cert_expires}" +%s`
+         remaining=$(($exp - $now))
+ 
+         if [ ${remaining} -le 0 ] # cert expired
diff --git a/net/sipxcommserverlib/files/patch-bin_ssl-cert_gen-ssl-keys.sh.in b/net/sipxcommserverlib/files/patch-bin_ssl-cert_gen-ssl-keys.sh.in
new file mode 100644
index 000000000000..e3bd3f563b91
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-bin_ssl-cert_gen-ssl-keys.sh.in
@@ -0,0 +1,37 @@
+--- ./bin/ssl-cert/gen-ssl-keys.sh.in.orig	Sat Dec 30 16:45:06 2006
++++ ./bin/ssl-cert/gen-ssl-keys.sh.in	Sat Dec 30 16:45:55 2006
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/local/bin/bash
+ ##
+ ##  gen-ssl-keys.sh - generate SSL key and certificate files.
+ ##
+@@ -33,7 +33,8 @@
+ openssl="@OPENSSL@"
+ 
+ # default base name for ca and its files
+-caName=ca.`hostname --domain`
++dom=`hostname | sed 's/[^\.]*\.\(.*\)/\1/'`
++caName=ca.$dom
+ 
+ # if there is a file of saved default answers for the questions, read them
+ Defaults=SSL_DEFAULTS
+@@ -207,14 +208,15 @@
+ 
+ EOF
+ 
+-    askfor sipDomainName "SIP domain name" `hostname --domain` 
+-    askfor server        "Full DNS name for the server" `hostname --fqdn` NOSTORE
++    dom=`hostname | sed 's/[^\.]*\.\(.*\)/\1/'`
++    askfor sipDomainName "SIP domain name" $dom
++    askfor server        "Full DNS name for the server" `hostname` NOSTORE
+     while test ${caName} = ${server}
+       do
+       echo "" 1>&2
+       echo "Error: The Server name must not be the same as the CA name." 1>&2
+       server=""
+-      askfor server "Server Common Name (DNS name for Server)" `hostname --fqdn` NOSTORE
++      askfor server "Server Common Name (DNS name for Server)" `hostname` NOSTORE
+     done
+ 
+     askfor serverEmail "Email Contact Address for Server (name@example.org)" "${caEmail}" NOSTORE
diff --git a/net/sipxcommserverlib/files/patch-bin_ssl-cert_install-cert.sh.in b/net/sipxcommserverlib/files/patch-bin_ssl-cert_install-cert.sh.in
new file mode 100644
index 000000000000..292937b64290
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-bin_ssl-cert_install-cert.sh.in
@@ -0,0 +1,17 @@
+--- ./bin/ssl-cert/install-cert.sh.in.orig	Sat Dec 30 16:46:08 2006
++++ ./bin/ssl-cert/install-cert.sh.in	Sat Dec 30 16:46:33 2006
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/local/bin/bash
+ ##
+ ## install-cert.sh
+ ##
+@@ -41,7 +41,7 @@
+ 
+ if [ -z "${Basename}" ]
+ then
+-    Basename=`hostname --fqdn`
++    Basename=`hostname`
+ fi
+ 
+ if ! [ -f "${Basename}.crt" -a -f "${Basename}.key" ]
diff --git a/net/sipxcommserverlib/files/patch-doc-Makefile.am b/net/sipxcommserverlib/files/patch-doc-Makefile.am
new file mode 100644
index 000000000000..622779a9dcc4
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-doc-Makefile.am
@@ -0,0 +1,11 @@
+--- doc/Makefile.am.orgi	Mon Jan 29 12:35:15 2007
++++ doc/Makefile.am	Mon Jan 29 12:37:08 2007
+@@ -32,7 +32,7 @@
+ 	rm -rf $(DESTDIR)@SIPX_DOCDIR@/@PACKAGE@
+ 	@INSTALL@ -d $(DESTDIR)@SIPX_DOCDIR@/@PACKAGE@
+ 	find @PACKAGE@ -type f -print \
+-	| xargs -i% @INSTALL@ -m u=rw,go=r % $(DESTDIR)@SIPX_DOCDIR@/%
++	| xargs -I% @INSTALL@ -m u=rw,go=r % $(DESTDIR)@SIPX_DOCDIR@/%
+ 
+ install-ssl-doc: $(DESTDIR)@SIPX_DOCDIR@/INSTALL.ssl
+ 
diff --git a/net/sipxcommserverlib/files/patch-doc-Makefile.in b/net/sipxcommserverlib/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..048552e5dca8
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orgi	Mon Jan 29 12:35:07 2007
++++ doc/Makefile.in	Mon Jan 29 12:37:18 2007
+@@ -485,7 +485,7 @@
+ 	rm -rf $(DESTDIR)@SIPX_DOCDIR@/@PACKAGE@
+ 	@INSTALL@ -d $(DESTDIR)@SIPX_DOCDIR@/@PACKAGE@
+ 	find @PACKAGE@ -type f -print \
+-	| xargs -i% @INSTALL@ -m u=rw,go=r % $(DESTDIR)@SIPX_DOCDIR@/%
++	| xargs -I% @INSTALL@ -m u=rw,go=r % $(DESTDIR)@SIPX_DOCDIR@/%
+ 
+ install-ssl-doc: $(DESTDIR)@SIPX_DOCDIR@/INSTALL.ssl
+ 
diff --git a/net/sipxcommserverlib/files/patch-etc_config.defs.in b/net/sipxcommserverlib/files/patch-etc_config.defs.in
new file mode 100644
index 000000000000..01180c362ab6
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-etc_config.defs.in
@@ -0,0 +1,29 @@
+--- ./etc/config.defs.in.orig	Sun Dec 31 14:13:17 2006
++++ ./etc/config.defs.in	Thu Jan  4 13:33:39 2007
+@@ -12,10 +12,10 @@
+ # host name (e.g. myhost.domain.com).
+ # If you use DNS SRV, the SIPXCHANGE_DOMAIN_NAME should be set 
+ # to domain name (e.g. domain.com), so comment out the assignment
+-# below that uses -f and uncomment the one that uses -d:
++# below that uses hostname and uncomment the one that uses hostname | cut
+ #
+-SIPXCHANGE_DOMAIN_NAME=`hostname -f`
+-# SIPXCHANGE_DOMAIN_NAME=`hostname -d`
++SIPXCHANGE_DOMAIN_NAME=`hostname`
++# SIPXCHANGE_DOMAIN_NAME=`hostname | cut -d . -f 2-`
+ 
+ #### Core Limit
+ # Control whether or not core files are saved in a server failure.
+@@ -24,10 +24,10 @@
+ SIPX_CORELIMIT=unlimited
+ 
+ # the realm string used in authentication challenges
+-SIPXCHANGE_REALM=`hostname -d`
++SIPXCHANGE_REALM=`hostname | cut -d . -f 2-`
+ 
+ ##### Information about this server #####
+-MY_FULL_HOSTNAME=`hostname -f`
++MY_FULL_HOSTNAME=`hostname`
+ MY_HOSTNAME=`hostname -s`
+ MY_IP_ADDR=`@bindir@/get_def_addr`
+ 
diff --git a/net/sipxcommserverlib/files/patch-include_fastdb_cliproto.h b/net/sipxcommserverlib/files/patch-include_fastdb_cliproto.h
new file mode 100644
index 000000000000..d8a6fdb49130
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-include_fastdb_cliproto.h
@@ -0,0 +1,14 @@
+--- ./include/fastdb/cliproto.h.orig	Thu Dec 28 18:47:56 2006
++++ ./include/fastdb/cliproto.h	Thu Dec 28 18:49:16 2006
+@@ -81,10 +81,7 @@
+     cli_oid
+ };
+ 
+-#if defined(__FreeBSD__)
+-#include <sys/param.h>
+-#define USE_HTON_NTOH
+-#elif defined(__linux__)
++#if defined(__linux__) || defined(__FreeBSD__)
+ //
+ // At Linux inline assembly declarations of ntohl, htonl... are available
+ //
diff --git a/net/sipxcommserverlib/files/patch-include_fastdb_sync.h b/net/sipxcommserverlib/files/patch-include_fastdb_sync.h
new file mode 100644
index 000000000000..344b8f9c0e50
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-include_fastdb_sync.h
@@ -0,0 +1,11 @@
+--- ./include/fastdb/sync.h.orig	Thu Dec 28 18:42:54 2006
++++ ./include/fastdb/sync.h	Thu Dec 28 18:47:03 2006
+@@ -613,7 +613,7 @@
+ 
+     // for Linux: Temporary addition to aid debugging
+     int getTid() {
+-       return tid;
++       return (int)tid;
+     }
+ 
+     int getPid() {
diff --git a/net/sipxcommserverlib/files/patch-src_sipx-utils.sh b/net/sipxcommserverlib/files/patch-src_sipx-utils.sh
new file mode 100644
index 000000000000..eafad1f1a51d
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-src_sipx-utils.sh
@@ -0,0 +1,73 @@
+--- ./src/sipx-utils.sh.orig	Mon Jan  1 19:30:33 2007
++++ ./src/sipx-utils.sh	Mon Jan  1 19:37:57 2007
+@@ -41,16 +41,24 @@
+   }
+ 
+ 
++#
++# Let's modify this slightly to allow a hostname as the second arg and
++# not just an IP address.
++#
+ sip_resolves_to () { # ( unresolved, targetIp )
+     # returns true (0) if the unresolved name resolves to the targetIp address by sip rules
+      unresolvedName=$1
+      targetAddr=$2
++     targetAddr2=`dns_a $2`
+ 
+      for ip in `dns_a ${unresolvedName}`
+      do
+        if [ "${ip}" = "${targetAddr}" ]
+        then
+            return 0
++       elif [ "${ip}" = "${targetAddr2}" ]
++       then
++           return 0
+        fi
+      done
+ 
+@@ -61,6 +69,9 @@
+          if [ "${ip}" = "${targetAddr}" ]
+          then
+              return 0
++         elif [ "${ip}" = "${targetAddr2}" ]
++         then
++             return 0
+          fi
+        done
+      done
+@@ -70,12 +81,18 @@
+        if [ "${tcpSrv}" = "${targetAddr}" ]
+        then
+            return 0
++       elif [ "${tcpSrv}" = "${targetAddr2}" ]
++       then
++           return 0
+        else
+            for ip in `dns_a ${tcpSrv}`
+            do
+              if [ "${ip}" = "${targetAddr}" ]
+              then
+                  return 0
++             elif [ "${ip}" = "${targetAddr2}" ]
++             then
++                 return 0
+              fi
+            done
+        fi
+@@ -86,10 +103,16 @@
+        if [ "${udpSrv}" = "${targetAddr}" ]
+        then
+            return 0
++       elif [ "${udpSrv}" = "${targetAddr2}" ]
++       then
++           return 0
+        else
+            for ip in `dns_a ${udpSrv}`
+            do
+              if [ "${ip}" = "${targetAddr}" ]
++             then
++                 return 0
++             elif [ "${ip}" = "${targetAddr2}" ]
+              then
+                  return 0
+              fi
diff --git a/net/sipxcommserverlib/files/patch-src_test_Makefile.am b/net/sipxcommserverlib/files/patch-src_test_Makefile.am
new file mode 100644
index 000000000000..5d17556f52d8
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-src_test_Makefile.am
@@ -0,0 +1,30 @@
+--- ./src/test/Makefile.am.orig	Sun Jan  7 16:20:05 2007
++++ ./src/test/Makefile.am	Sun Jan  7 16:34:25 2007
+@@ -9,8 +9,8 @@
+   OdbcWrapperTest.cpp
+ db_CXXFLAGS = -DTESTDATABASE=\"$(SIPXTEST_DATABASE)\"
+ db_deps = db_setup
+-PG_USER = postgres
+-SCHEMA_FILE = $(top_srcdir)/../sipXproxy/etc/database/schema.sql
++PG_USER = pgsql
++SCHEMA_FILE = $(top_srcdir)/../sipxproxy-3.6.0/etc/database/schema.sql
+ else
+ db_FILES = 
+ db_CXXFLAGS =
+@@ -19,7 +19,7 @@
+ 
+ ## All tests under this GNU variable should run relatively quickly
+ ## and of course require no setup
+-TESTS = testsuite sipx_config_value_test
++TESTS = testsuite sipx_config_value/test
+ 
+ check_PROGRAMS = testsuite sandbox
+ 
+@@ -78,6 +78,6 @@
+     psql -U $(PG_USER) -d $(SIPXTEST_DATABASE) \
+       -f $(SCHEMA_FILE) &>/dev/null; \
+   else \
+-    @echo "Schema file $(SCHEMA_FILE) not found"; \
++    echo "Schema file $(SCHEMA_FILE) not found"; \
+   fi
+ 	@echo "Done."
diff --git a/net/sipxcommserverlib/files/patch-src_test_Makefile.in b/net/sipxcommserverlib/files/patch-src_test_Makefile.in
new file mode 100644
index 000000000000..8a008924d06e
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-src_test_Makefile.in
@@ -0,0 +1,24 @@
+--- ./src/test/Makefile.in.orig	Sun Jan  7 16:20:12 2007
++++ ./src/test/Makefile.in	Sun Jan  7 16:34:30 2007
+@@ -268,9 +268,9 @@
+ @ENABLE_ODBC_TESTS_TRUE@db_CXXFLAGS = -DTESTDATABASE=\"$(SIPXTEST_DATABASE)\"
+ @ENABLE_ODBC_TESTS_FALSE@db_deps = 
+ @ENABLE_ODBC_TESTS_TRUE@db_deps = db_setup
+-@ENABLE_ODBC_TESTS_TRUE@PG_USER = postgres
+-@ENABLE_ODBC_TESTS_TRUE@SCHEMA_FILE = $(top_srcdir)/../sipXproxy/etc/database/schema.sql
+-TESTS = testsuite sipx_config_value_test
++@ENABLE_ODBC_TESTS_TRUE@PG_USER = pgsql
++@ENABLE_ODBC_TESTS_TRUE@SCHEMA_FILE = $(top_srcdir)/../sipxproxy-3.6.0/etc/database/schema.sql
++TESTS = testsuite sipx_config_value/test
+ testsuite_CXXFLAGS = \
+     -DTEST_DATA_DIR=\"@abs_top_srcdir@/src/test\" \
+     -DTEST_WORK_DIR=\"@abs_top_builddir@/src/test/work\" \
+@@ -833,7 +833,7 @@
+     psql -U $(PG_USER) -d $(SIPXTEST_DATABASE) \
+       -f $(SCHEMA_FILE) &>/dev/null; \
+   else \
+-    @echo "Schema file $(SCHEMA_FILE) not found"; \
++    echo "Schema file $(SCHEMA_FILE) not found"; \
+   fi
+ 	@echo "Done."
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/sipxcommserverlib/files/patch-src_test_OdbcWrapperTest.cpp b/net/sipxcommserverlib/files/patch-src_test_OdbcWrapperTest.cpp
new file mode 100644
index 000000000000..8df57686f800
--- /dev/null
+++ b/net/sipxcommserverlib/files/patch-src_test_OdbcWrapperTest.cpp
@@ -0,0 +1,47 @@
+--- ./src/test/OdbcWrapperTest.cpp.orig	Sun Jan  7 16:20:24 2007
++++ ./src/test/OdbcWrapperTest.cpp	Sun Jan  7 16:21:01 2007
+@@ -54,7 +54,7 @@
+          
+          CPPUNIT_ASSERT((handle=odbcConnect(DATABASE_NAME,
+                                             "localhost",
+-                                            "postgres",
++                                            "pgsql",
+                                             "{PostgreSQL}"))!=NULL);
+          if (handle)
+          {                                                     
+@@ -141,7 +141,7 @@
+        
+          CPPUNIT_ASSERT((handle=odbcConnect(DATABASE_NAME,
+                                             "localhost",
+-                                            "postgres",
++                                            "pgsql",
+                                             "{PostgreSQL}"))!=NULL);
+          
+          if (handle)
+@@ -156,7 +156,7 @@
+          
+          CPPUNIT_ASSERT((handle=odbcConnect(DATABASE_NAME,
+                                             "localhost",
+-                                            "postgres",
++                                            "pgsql",
+                                             "{PostgreSQL}"))!=NULL);
+          if (handle)
+          {
+@@ -173,7 +173,7 @@
+       
+          CPPUNIT_ASSERT((handle=odbcConnect(DATABASE_NAME,
+                                             "localhost",
+-                                            "postgres",
++                                            "pgsql",
+                                             "{PostgreSQL}"))!=NULL);
+          
+          if (handle)
+@@ -216,7 +216,7 @@
+       
+          CPPUNIT_ASSERT((handle=odbcConnect(DATABASE_NAME,
+                                             "localhost",
+-                                            "postgres",
++                                            "pgsql",
+                                             "{PostgreSQL}"))!=NULL);
+          
+          if (handle)
diff --git a/net/sipxcommserverlib/files/pkg-deinstall.in b/net/sipxcommserverlib/files/pkg-deinstall.in
new file mode 100644
index 000000000000..9a5d5dd99913
--- /dev/null
+++ b/net/sipxcommserverlib/files/pkg-deinstall.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
+
+LOCALSTATEDIR="%%LOCALSTATEDIR%%"
+
+post-deinstall() {
+        rm -rf ${LOCALSTATEDIR}/sipxdata/tmp
+        rm -rf ${LOCALSTATEDIR}/run/sipxdata
+        rm -rf ${LOCALSTATEDIR}/log/sipxdata
+
+
+        echo "WARNING: If you will *NOT* use this package anymore, please remove
+ the"
+        echo "  following file and directories manually:"
+        echo "  ${LOCALSTATEDIR}/sipxdata/upgrade/sipxcommserverlib-previous.tgz"
+        echo "  ${LOCALSTATEDIR}/sipxdata/sipdb"
+        echo "  ${LOCALSTATEDIR}/sipxdata"
+        echo
+}
+
+case $2 in
+        POST-DEINSTALL)
+                post-deinstall
+                ;;
+esac
diff --git a/net/sipxcommserverlib/pkg-descr b/net/sipxcommserverlib/pkg-descr
new file mode 100644
index 000000000000..b9f8dfc164c4
--- /dev/null
+++ b/net/sipxcommserverlib/pkg-descr
@@ -0,0 +1,5 @@
+sipXcommserverlib is a library that handles communication between
+various sipX components.  It is a necessary dependancy of the sipX
+project.
+
+WWW: http://sipx-wiki.calivia.com/index.php/Main_Page
diff --git a/net/sipxcommserverlib/pkg-plist b/net/sipxcommserverlib/pkg-plist
new file mode 100644
index 000000000000..f5b2395e1072
--- /dev/null
+++ b/net/sipxcommserverlib/pkg-plist
@@ -0,0 +1,105 @@
+bin/configpp
+bin/get_def_addr
+bin/pgpatch.sh
+bin/pkg-upgrade
+bin/sipdbtest
+bin/sipdbtest.sh
+bin/sipx-dns
+bin/sipx-validate-xml
+bin/sipxcommserverlib-config
+bin/ssl-cert/ca_rehash
+bin/ssl-cert/check-cert.sh
+bin/ssl-cert/gen-ssl-keys.sh
+bin/ssl-cert/install-cert.sh
+bin/xsdvalid
+etc/sipxpbx/config.defs
+etc/sipxpbx/process.d/keepalive.process.xml
+include/configrpc/ConfigRPC.h
+include/digitmaps/UrlMapping.h
+include/fastdb/CHANGES
+include/fastdb/array.h
+include/fastdb/bugdb.h
+include/fastdb/class.h
+include/fastdb/cli.h
+include/fastdb/clidb.h
+include/fastdb/cliproto.h
+include/fastdb/compiler.d
+include/fastdb/compiler.h
+include/fastdb/container.h
+include/fastdb/cursor.h
+include/fastdb/database.h
+include/fastdb/date.h
+include/fastdb/datetime.h
+include/fastdb/exception.h
+include/fastdb/fastdb.h
+include/fastdb/file.h
+include/fastdb/harray.h
+include/fastdb/hashtab.h
+include/fastdb/localcli.h
+include/fastdb/query.h
+include/fastdb/reference.h
+include/fastdb/repsock.h
+include/fastdb/server.h
+include/fastdb/set.h
+include/fastdb/sockio.h
+include/fastdb/stdtp.h
+include/fastdb/subsql.h
+include/fastdb/symtab.h
+include/fastdb/sync.h
+include/fastdb/ttree.h
+include/fastdb/unisock.h
+include/fastdb/w32sock.h
+include/fastdb/wwwapi.h
+include/filereader/OrbitFileReader.h
+include/odbc/OdbcWrapper.h
+include/sipdb/AliasDB.h
+include/sipdb/AliasRow.h
+include/sipdb/AuthexceptionDB.h
+include/sipdb/AuthexceptionRow.h
+include/sipdb/CallerAliasDB.h
+include/sipdb/CallerAliasRow.h
+include/sipdb/CredentialDB.h
+include/sipdb/CredentialRow.h
+include/sipdb/DialByNameDB.h
+include/sipdb/DialByNameRow.h
+include/sipdb/ExtensionDB.h
+include/sipdb/ExtensionRow.h
+include/sipdb/HuntgroupDB.h
+include/sipdb/HuntgroupRow.h
+include/sipdb/PermissionDB.h
+include/sipdb/PermissionRow.h
+include/sipdb/RegistrationBinding.h
+include/sipdb/RegistrationDB.h
+include/sipdb/RegistrationRow.h
+include/sipdb/ResultSet.h
+include/sipdb/SIPDBManager.h
+include/sipdb/SIPXAuthHelper.h
+include/sipdb/SubscriptionDB.h
+include/sipdb/SubscriptionRow.h
+include/testlib/FileTestContext.h
+include/testlib/RegistrationDbTestContext.h
+include/testlib/SipDbTestContext.h
+lib/libsipXcommserver.a
+lib/libsipXcommserver.la
+lib/libsipXcommserver.so
+lib/libsipXcommserver.so.1
+lib/libsipXcommserverTest.a
+lib/libsipXcommserverTest.la
+libexec/sipx-utils.sh
+share/sipx/schema/authrules.xsd
+share/sipx/schema/urlmap.xsd
+@dirrm share/sipxpbx
+@dirrm share/sipx/schema
+@dirrm share/sipx
+@dirrm include/testlib
+@dirrm include/sipdb
+@dirrm include/odbc
+@dirrm include/filereader
+@dirrm include/fastdb
+@dirrm include/digitmaps
+@dirrm include/configrpc
+@dirrm etc/sipxpbx/ssl/authorities
+@dirrm etc/sipxpbx/ssl
+@dirrm etc/sipxpbx/process.d
+@dirrm etc/sipxpbx
+@dirrm bin/ssl-cert