summaryrefslogtreecommitdiff
path: root/net/sipxcommserverlib/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/sipxcommserverlib/files')
-rw-r--r--net/sipxcommserverlib/files/patch-bin_get_def_addr28
-rw-r--r--net/sipxcommserverlib/files/patch-bin_pgpatch.sh62
-rw-r--r--net/sipxcommserverlib/files/patch-bin_ssl-cert_check-cert.sh.in11
-rw-r--r--net/sipxcommserverlib/files/patch-bin_ssl-cert_gen-ssl-keys.sh.in37
-rw-r--r--net/sipxcommserverlib/files/patch-bin_ssl-cert_install-cert.sh.in17
-rw-r--r--net/sipxcommserverlib/files/patch-doc-Makefile.am11
-rw-r--r--net/sipxcommserverlib/files/patch-doc-Makefile.in11
-rw-r--r--net/sipxcommserverlib/files/patch-etc_config.defs.in29
-rw-r--r--net/sipxcommserverlib/files/patch-include_fastdb_cliproto.h14
-rw-r--r--net/sipxcommserverlib/files/patch-include_fastdb_sync.h11
-rw-r--r--net/sipxcommserverlib/files/patch-src_sipx-utils.sh73
-rw-r--r--net/sipxcommserverlib/files/patch-src_test_Makefile.am30
-rw-r--r--net/sipxcommserverlib/files/patch-src_test_Makefile.in24
-rw-r--r--net/sipxcommserverlib/files/patch-src_test_OdbcWrapperTest.cpp47
-rw-r--r--net/sipxcommserverlib/files/pkg-deinstall.in26
-rw-r--r--net/sipxcommserverlib/files/pkg-install.in50
16 files changed, 0 insertions, 481 deletions
diff --git a/net/sipxcommserverlib/files/patch-bin_get_def_addr b/net/sipxcommserverlib/files/patch-bin_get_def_addr
deleted file mode 100644
index 181d08ffffa6..000000000000
--- a/net/sipxcommserverlib/files/patch-bin_get_def_addr
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./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
deleted file mode 100644
index 32eb0a4fd859..000000000000
--- a/net/sipxcommserverlib/files/patch-bin_pgpatch.sh
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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
deleted file mode 100644
index 686727e324db..000000000000
--- a/net/sipxcommserverlib/files/patch-bin_ssl-cert_check-cert.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index e3bd3f563b91..000000000000
--- a/net/sipxcommserverlib/files/patch-bin_ssl-cert_gen-ssl-keys.sh.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./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
deleted file mode 100644
index 292937b64290..000000000000
--- a/net/sipxcommserverlib/files/patch-bin_ssl-cert_install-cert.sh.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./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
deleted file mode 100644
index 622779a9dcc4..000000000000
--- a/net/sipxcommserverlib/files/patch-doc-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 048552e5dca8..000000000000
--- a/net/sipxcommserverlib/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 01180c362ab6..000000000000
--- a/net/sipxcommserverlib/files/patch-etc_config.defs.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./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
deleted file mode 100644
index d8a6fdb49130..000000000000
--- a/net/sipxcommserverlib/files/patch-include_fastdb_cliproto.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./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
deleted file mode 100644
index 344b8f9c0e50..000000000000
--- a/net/sipxcommserverlib/files/patch-include_fastdb_sync.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index eafad1f1a51d..000000000000
--- a/net/sipxcommserverlib/files/patch-src_sipx-utils.sh
+++ /dev/null
@@ -1,73 +0,0 @@
---- ./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
deleted file mode 100644
index 5d17556f52d8..000000000000
--- a/net/sipxcommserverlib/files/patch-src_test_Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./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
deleted file mode 100644
index 8a008924d06e..000000000000
--- a/net/sipxcommserverlib/files/patch-src_test_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./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
deleted file mode 100644
index 8df57686f800..000000000000
--- a/net/sipxcommserverlib/files/patch-src_test_OdbcWrapperTest.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./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
deleted file mode 100644
index 9a5d5dd99913..000000000000
--- a/net/sipxcommserverlib/files/pkg-deinstall.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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/files/pkg-install.in b/net/sipxcommserverlib/files/pkg-install.in
deleted file mode 100644
index 6d7d918435bc..000000000000
--- a/net/sipxcommserverlib/files/pkg-install.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-USER=sipx
-GROUP=sipx
-
-case $2 in
-PRE-INSTALL)
- if pw group show "${GROUP}" 2> /dev/null ; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if pw groupadd ${GROUP} ; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Add of group \"${GROUP}\" failed."
- exit 1
- fi
- fi
-
- if pw user show "${USER}" 2> /dev/null ; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if pw useradd ${USER} -g ${GROUP} -h - \
- -d %%LOCALSTATEDIR%%/sipxdata/configserver/phone/profile/tftproot -s %%PREFIX%%/bin/bash -c "sipX" ; then
- echo "Added user \"${USER}\"."
- else
- echo "Add of user \"${USER}\" failed."
- exit 1
- fi
- fi
- ;;
-POST-INSTALL)
- # Create a dummy file in /usr/local/share/sipxpbx to act
- # as a poorman's reference count. Both sipxcommserverlib
- # and sipxconfig create this directory. Though sipxcommserverlib
- # does not put any files in it. When sipxconfig deinstalls
- # there is nothing to prevent it from completely removing
- # the directory. Then when sipxcommservlib deinstalls, it
- # finds the directory it created is now gone.
- #
- # By creating a dummy file here, we'll prevent sipxconfig
- # from completely removing the directory and this will make
- # tinderbox happy when it deinstalls sipxcommserverlib.
- mkdir -p %%PREFIX%%/share/sipxpbx
- /usr/bin/touch %%PREFIX%%/share/sipxpbx/.sipxcommserverlib_dummy
-
- chown ${USER}:${GROUP} %%PREFIX%%/etc/sipxpbx
- ;;
-esac