Merge branch 'master' of ssh://github.com/dhubler/sipxecs

config/general.m4

@@ -472,6 +472,9 @@ AC_DEFUN([CHECK_APACHE2],
    AC_SUBST(APACHE2_HOST_ACCESS, $apache2_host_access)
    AC_SUBST(APACHE2_MOD_ACCESS, $apache2_mod_access)
 
+   AC_SUBST(APACHE2_USER, apache)
+   AC_SUBST(APACHE2_GROUP, apache)
+
    ## Apache Modules Directory
    AC_MSG_CHECKING([for apache2 modules directory])
    AC_ARG_WITH([apache-modules],
@@ -513,6 +516,10 @@ AC_DEFUN([CHECK_APACHE2],
    else
        AC_MSG_ERROR('$apache2_mod_access' and 'httpd.exp' not found; tried: $tried_path)
    fi
+
+   apache2_home=`dirname ${apache2_moddir}`
+   AC_SUBST(APACHE2_CONFDIR, ${apache2_home}/conf.d)
+   AC_SUBST(APACHE2_CONF, ${apache2_home}/conf/httpd.conf)
 ])dnl
 
 # ================ ZLIB ================

config/sipXlib.m4

@@ -62,6 +62,9 @@ AC_DEFUN([SFAC_SIPX_GLOBAL_OPTS],
     AC_ARG_VAR(OPENFIRE_HOME, [The home for openfire ])
     test -z "$OPENFIRE_HOME" && OPENFIRE_HOME=/opt/openfire
 
+    AC_ARG_VAR(OPENACD_HOME, [The home for OpenACD ])
+    test -z "$OPENACD_HOME" && OPENACD_HOME=/opt/OpenACD
+
     AC_ARG_ENABLE(rpmbuild, 
       AC_HELP_STRING([--enable-rpmbuild], [Build an rpm]),
       enable_rpmbuild=yes)

config/utility.am

@@ -72,6 +72,7 @@ CommonVariablesNames = \
 	$(filter GEM%,$(.VARIABLES)) \
 	$(filter FREESWITCH%,$(.VARIABLES)) \
 	$(filter OPENFIRE%,$(.VARIABLES)) \
+	$(filter OPENACD%,$(.VARIABLES)) \
 	$(filter APACHE%,$(.VARIABLES)) \
 	$(filter PACKAGE%,$(.VARIABLES)) \
 	$(filter-out am__%,$(filter %dir,$(.VARIABLES)))

mak/app.mk.in

@@ -11,16 +11,10 @@ sf_broken = \
   sipXpreflight \
   sipXrls \
   sipXsaa \
-  sipXrest \
-  sipXcallController \
-  sipXcdrLog \
   sipXtools \
   sipXpark \
   sipXpresence \
-  sipXimbot \
   sipXpage \
-  sipXprovision \
-  sipXrecording \
   sipXphonelog
 
 sf = \
@@ -40,7 +34,14 @@ sf = \
   sipXsnom \
   sipXunidata \
   sipXgrandstream \
-  sipXexample
+  sipXimbot \
+  sipXexample \
+  sipXrest \
+  sipXcallController \
+  sipXcdrLog \
+  sipXevent \
+  sipXrecording \
+  sipXprovision
 
 lang = \
   sipXlang-abitibi-fr_CA \

mak/comps.xml

@@ -1,34 +1,53 @@
 <?xml version="1.0"?>
 <!DOCTYPE comps PUBLIC "-//The cAos Project//DTD Comps info//EN" "comps.dtd">
-<!--
-  - I cannot get groups to be recursive. groupreq doesn't appear to have
-  - much effect. See
-  -   https://lists.dulug.duke.edu/pipermail/yum-devel/2006-May/002140.html
-  - categories do not help either. From what I can tell, you need to duplicate
-  - package dependencies
-  -->
 <comps>
   <group>
    <id>sipxecs</id>
    <uservisible>true</uservisible>
-   <name>sipXecs PBX</name>
-   <description>Standard sipXpbx PBX</description>
+   <name>sipXecs UCnified Communications System</name>
+   <description>Primary or main sipXecs install, Install more than you
+   may use, but not everything is enabled by default</description>
    <packagelist>
      <packagereq type="mandatory">sipxproxy</packagereq>
      <packagereq type="mandatory">sipxpublisher</packagereq>
      <packagereq type="mandatory">sipxregistry</packagereq>
      <packagereq type="mandatory">sipxconfig</packagereq>
-     <!-- counterpath : deps because of web deployment issues -->
-     <packagereq type="mandatory">sipxcounterpath</packagereq>
-     <packagereq type="mandatory">sipxpolycom</packagereq>
-     <packagereq type="mandatory">sipxaudiocodes</packagereq>
      <packagereq type="mandatory">sipxbridge</packagereq>
      <packagereq type="mandatory">sipxivr</packagereq>
      <packagereq type="mandatory">sipxopenfire</packagereq>
      <packagereq type="mandatory">sipxfreeswitch</packagereq>
+     <packagereq type="mandatory">sipxdns</packagereq>
+     <!-- polycom arguable the defacto, but not strictly required -->
+     <packagereq type="mandatory">sipxpolycom</packagereq>
+     <!-- good to have one gateway option installed -->
+     <packagereq type="mandatory">sipxaudiocodes</packagereq>
+     <!-- counterpath : deps because of web deployment issues -->
+     <packagereq type="mandatory">sipxcounterpath</packagereq>
      <!-- 4.4 feature compatibility -->
      <packagereq type="mandatory">sipxconfig-ftp</packagereq>
      <packagereq type="mandatory">sipxconfig-tftp</packagereq>
+     <packagereq type="mandatory">sipxsnmp</packagereq>
+     <packagereq type="mandatory">sipxrecording</packagereq>
+     <packagereq type="mandatory">sipxcdr</packagereq>
+   </packagelist>
+  </group>
+  <group>
+   <id>sipxecs-2nd</id>
+   <uservisible>true</uservisible>
+   <name>sipXecs Additional Server</name>
+   <description>When you're installing addition systems.  You could install sipxecs but
+   there would be many components you wouldn't need because they are only relevant on the
+   primary server.</description>
+   <packagelist>
+     <packagereq type="mandatory">sipxproxy</packagereq>
+     <packagereq type="mandatory">sipxpublisher</packagereq>
+     <packagereq type="mandatory">sipxregistry</packagereq>
+     <packagereq type="mandatory">sipxbridge</packagereq>
+     <packagereq type="mandatory">sipxivr</packagereq>
+     <packagereq type="mandatory">sipxopenfire</packagereq>
+     <packagereq type="mandatory">sipxfreeswitch</packagereq>
+     <packagereq type="mandatory">sipxdns</packagereq>
+     <packagereq type="mandatory">sipxsnmp</packagereq>
    </packagelist>
   </group>
 </comps>

mak/list-dependencies.mk.in

@@ -38,6 +38,7 @@ REWRITE_DEPS_fedora = \
 	-e '/termcap/d' \
 	-e '/jpeg-devel/d' \
 	-e 's/libopenjpeg-devel/openjpeg-devel/g' \
+	-e 's/mongodb-devel/mongodb-devel-fsv2-patch/g' \
 	-e 's/curl-devel/libcurl-devel/g' \
 	-e 's/jakarta-commons-beanutils/apache-commons-beanutils/g'
 

mak/mock/fedora-14-i386.cfg.in

@@ -19,12 +19,12 @@ proxy=@DOWNLOAD_PROXY@
 
 [fedora]
 name=fedora
-@FEDORA_BASE_URL_ON@baseurl=@FEDORA_BASE_URL@/releases/14/Everything/i386/os/
+@FEDORA_BASE_URL_ON@baseurl=@FEDORA_ARCHIVE_BASE_URL@/releases/14/Everything/i386/os/
 @FEDORA_BASE_URL_OFF@mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386
 
 [updates]
 name=updates
-@FEDORA_BASE_URL_ON@baseurl=@FEDORA_BASE_URL@/updates/14/i386/
+@FEDORA_BASE_URL_ON@baseurl=@FEDORA_ARCHIVE_BASE_URL@/updates/14/i386/
 @FEDORA_BASE_URL_OFF@mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386
 
 [local]

mak/mock/fedora-14-x86_64.cfg.in

@@ -23,12 +23,12 @@ syslog_device=
 
 [fedora]
 name=fedora
-@FEDORA_BASE_URL_ON@baseurl=@FEDORA_BASE_URL@/releases/14/Everything/x86_64/os/
+@FEDORA_BASE_URL_ON@baseurl=@FEDORA_ARCHIVE_BASE_URL@/releases/14/Everything/x86_64/os/
 @FEDORA_BASE_URL_OFF@mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=x86_64
 
 [updates]
 name=updates
-@FEDORA_BASE_URL_ON@baseurl=@FEDORA_BASE_URL@/updates/14/x86_64/
+@FEDORA_BASE_URL_ON@baseurl=@FEDORA_ARCHIVE_BASE_URL@/updates/14/x86_64/
 @FEDORA_BASE_URL_OFF@mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=x86_64
 
 [local]

mak/modules.mk.in

@@ -15,6 +15,8 @@ sipx = \
   sipXsnmp \
   sipXpostgres \
   sipXmongo \
+  sipXdns \
+  sipXhttpd \
   sipXcommons \
   sipXrelay \
   sipXbridge \
@@ -30,6 +32,7 @@ sipx = \
   sipXproxy \
   sipXpublisher \
   sipXregistry \
+  sipXpark \
   sipXpolycom
 
 # re: ruby-postgres, there's a new one we should be using ruby-pgsql i 
@@ -39,18 +42,23 @@ lib_common = \
   freeswitch \
   js \
   mongo \
+  net-snmp \
   OpenACD \
   erlmongo \
   sipx-openfire \
   ruby-dbi \
   ruby-postgres \
-  cfengine
+  cfengine \
+  php-seclib
 
-$(foreach V,11 12 13 14 15 16 17 18 19 20,$(eval lib_fedora_$(V) = $(lib_common)))
+$(foreach V,11 12 13 14 15 16,$(eval lib_fedora_$(V) = $(lib_common) sec))
+
+$(foreach V,17 18 19 20,$(eval lib_fedora_$(V) = $(lib_common)))
 
 lib_centos_6 = \
   epel-release \
   $(lib_common) \
+  sec \
   nsis \
   nsis-data
 

mak/rpm.m4

@@ -2,36 +2,55 @@ dnl Initial Version Copyright (C) 2010 eZuce, Inc., All Rights Reserved.
 dnl Licensed to the User under the LGPL license.
 dnl
 
-AC_ARG_VAR(CENTOS_BASE_URL, [Where to find CentOS distribution. Example: http://centos.aol.com])
-AC_ARG_VAR(FEDORA_BASE_URL, [Where to find Fedora distribution. Example: http://mirrors.kernel.org/fedora])
-AC_ARG_VAR(EPEL_BASE_URL, [Where to find EPEL distribution. Example: http://mirrors.kernel.org/epel])
 AC_ARG_VAR(MIRROR_SITE, [Single place to find CentOS, Redhat and EPEL. Example: http://mirrors.kernel.org])
-if test -n "$MIRROR_SITE"; then
-  CENTOS_BASE_URL=$MIRROR_SITE/centos
-  FEDORA_BASE_URL=$MIRROR_SITE/fedora/linux
-  EPEL_BASE_URL=$MIRROR_SITE/epel
-fi
 
 AC_ARG_WITH(yum-proxy, [--with-yum-proxy send downloads thru caching proxy like squid to speed downloads], [
   AC_SUBST(DOWNLOAD_PROXY,$withval)
   AC_SUBST(DOWNLOAD_PROXY_CONFIG_LINE,"proxy=$withval")
   AC_SUBST(WGET_PROXY_OPTS,"http_proxy=$withval")
 
-  # Require BASE URL otherwise download proxy will be useless  
-  if test -z "$CENTOS_BASE_URL"; then
+# Require BASE URL otherwise download proxy will be useless  
+AC_ARG_VAR(CENTOS_BASE_URL, [Where to find CentOS distribution. Example: http://centos.aol.com])
+if test -z "$CENTOS_BASE_URL"; then
+  if test -n "$MIRROR_SITE"; then 
+    CENTOS_BASE_URL=$MIRROR_SITE/centos
+  else
     AC_MSG_ERROR([You must provide a value for CENTOS_BASE_URL if you are using a download proxy.\
  See http://wiki.sipfoundry.org/display/sipXecs/Install+squid+caching+server+to+reduce+build+time for more details.])
   fi
+fi
 
-  if test -z "$FEDORA_BASE_URL"; then
+AC_ARG_VAR(FEDORA_BASE_URL, [Where to find Fedora distribution. Example: http://mirrors.kernel.org/fedora/linux])
+if test -z "$FEDORA_BASE_URL"; then
+  if test -n "$MIRROR_SITE"; then 
+    FEDORA_BASE_URL=$MIRROR_SITE/fedora/linux
+  else
     AC_MSG_ERROR([You must provide a value for FEDORA_BASE_URL if you are using a download proxy.\
  See http://wiki.sipfoundry.org/display/sipXecs/Install+squid+caching+server+to+reduce+build+time for more details.])
   fi
+fi
+
+AC_ARG_VAR(FEDORA_ARCHIVE_BASE_URL, [Where to find Fedora archives. Example: http://mirrors.kernel.org/archive/fedora/linux])
+if test -z "$FEDORA_ARCHIVE_BASE_URL"; then
+  if test -n "$MIRROR_SITE"; then 
+    FEDORA_ARCHIVE_BASE_URL=$MIRROR_SITE/archive/fedora/linux
+  else
+    AC_MSG_ERROR([You must provide a value for FEDORA_ARCHIVE_BASE_URL if you are using a download proxy.\
+ See http://wiki.sipfoundry.org/display/sipXecs/Install+squid+caching+server+to+reduce+build+time for more details.])
+  fi
+fi
 
-  if test -z "$EPEL_BASE_URL"; then
+AC_ARG_VAR(EPEL_BASE_URL, [Where to find EPEL distribution. Example: http://mirrors.kernel.org/epel])
+if test -z "$EPEL_BASE_URL"; then
+  if test -n "$MIRROR_SITE"; then 
+    EPEL_BASE_URL=$MIRROR_SITE/epel
+  else
     AC_MSG_ERROR([You must provide a value for EPEL_BASE_URL if you are using a download proxy.\
  See http://wiki.sipfoundry.org/display/sipXecs/Install+squid+caching+server+to+reduce+build+time for more details.])
   fi
+fi
+
+
 ],)
 
 dnl NOTE: To support non-rpm based distos, write equivalent of this that defines DISTRO_* vars

mak/rpm.mk.in

@@ -91,6 +91,8 @@ repo-chroot-init : repo-create repo-webserver
 	test -d $(MOCK_RESULTS_DIR) || mkdir -p $(MOCK_RESULTS_DIR)
 	cd $(MOCK_RESULTS_DIR); createrepo $(CREATEREPO_OPTS) .
 	mock $(MOCK_OPTS) --init
+# these files get large, good time to reset them.
+	find $(MOCK_RESULTS_DIR) -name '*.log' -exec rm {} \;
 
 help.{1|2}.check-rpm = Install the project rpm in the mock environment to test install. This does not install all rpms generated by a project, just the main one.  You can install then pretty easily though with command 'mock -r $(MOCK_TARGET_PLATFORM) --install package-name'
 %.check-rpm : repo-webserver

mongo/.sipxecs.mk

@@ -1,14 +1,14 @@
 mongo_VER = 2.0.2
-mongo_SRPM = mongodb-$(mongo_VER)-1$(RPM_DIST).src.rpm
+mongo_SRPM = mongodb-$(mongo_VER)-99$(RPM_DIST).src.rpm
 mongo_SPEC = $(SRC)/$(PROJ)/mongodb.spec
 
-# NOTE: tarfile is *not* pristine. there are 3 patches applied to it before creating tarball.
+# NOTE: there are 3 issues related to  mongo
 #   http://jira.mongodb.org/browse/SERVER-4178
 #   http://jira.mongodb.org/browse/SERVER-4179
 #   http://jira.mongodb.org/browse/SERVER-4181
-# but assumption is these will be applied upstream and we won't have to maintain these patches.
 mongo_SOURCES = \
-	mongodb-src-r$(mongo_VER).tar.gz
+	mongodb-src-r$(mongo_VER).tar.gz \
+	$(SRC)/$(PROJ)/boost-fsv2-compiler-err.patch
 
 # targets not defined, nothing to do
 mongo.autoreconf mongo.configure mongo.dist :;

mongo/boost-fsv2-compiler-err.patch

@@ -0,0 +1,14 @@
+diff -ru before/mongodb-src-r2.0.2/pch.h after/mongodb-src-r2.0.2/pch.h
+--- before/mongodb-src-r2.0.2/pch.h	2011-12-14 12:18:48.000000000 -0500
++++ after/mongodb-src-r2.0.2/pch.h	2011-12-21 08:50:05.000000000 -0500
+@@ -80,9 +80,7 @@
+ #include "boost/thread/once.hpp"
+ //#include <boost/archive/iterators/transform_width.hpp>
+ #define BOOST_FILESYSTEM_VERSION 2
+-#include <boost/filesystem/convenience.hpp>
+-#include <boost/filesystem/exception.hpp>
+-#include <boost/filesystem/operations.hpp>
++#include <boost/filesystem.hpp>
+ #include <boost/program_options.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/smart_ptr.hpp>

mongo/mongodb.spec

@@ -1,12 +1,13 @@
 Name: mongodb
 Version: 2.0.2
-Release: 1%{?dist}
+Release: 99%{?dist}
 Summary: mongo client shell and tools
 License: AGPL 3.0
 URL: http://www.mongodb.org
 Group: Applications/Databases
 
 Source0: %{name}-src-r%{version}.tar.gz
+Patch: boost-fsv2-compiler-err.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: js-devel, readline-devel, boost-devel, pcre-devel
 BuildRequires: gcc-c++, scons
@@ -35,6 +36,8 @@ softwware, default configuration files, and init.d scripts.
 Summary: Headers and libraries for mongo development. 
 Group: Applications/Databases
 
+Provides: mongodb-devel-fsv2-patch
+
 %description devel
 Mongo (from "huMONGOus") is a schema-free document-oriented database.
 
@@ -43,6 +46,7 @@ to develop mongo client software.
 
 %prep
 %setup -n mongodb-src-r%{version}
+%patch -p2
 
 %build
 scons --prefix=$RPM_BUILD_ROOT/usr --sharedclient --full all