HALLELUJAH.

4 files changed, 24 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 136682d03168..1243f66f0362 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 # Generated by mksrcinfo v8
-# Sat Jun 24 00:11:51 UTC 2017
+# Sun Apr 14 16:38:26 UTC 2019
 pkgbase = freeswitch
 	pkgdesc = An opensource and free (libre, price) telephony system, similar to Asterisk.
-	pkgver = 1.6.17
-	pkgrel = 2
+	pkgver = 1.8.5
+	pkgrel = 1
 	url = http://freeswitch.org/
 	install = freeswitch.install
-	changelog = ChangeLog
 	arch = i686
 	arch = x86_64
 	license = MPL
@@ -43,7 +42,7 @@ pkgbase = freeswitch
 	conflicts = freeswitch-fixed
 	backup = etc/freeswitch/private/passwords.xml
 	backup = etc/freeswitch/vars.xml
-	source = git+https://stash.freeswitch.org/scm/fs/freeswitch.git#tag=v1.6.17
+	source = git+https://freeswitch.org/stash/scm/fs/freeswitch.git/#tag=v1.8.5
 	source = freeswitch.conf.d
 	source = README.freeswitch
 	source = run.freeswitch
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c8460e7b6ed8..000000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2014-09-30 Brent Saner <bts (at) phreewifi (dot) org>
-	* 20140930-1 :
-	 Comment by chetwisniewski, 2014-09-30 02:19EDT. # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" throws build fail due to -Werror. Sedding out.
-
-2014-08-25 Brent Saner <bts (at) phreewifi (dot) org>
-	* 20140825-1 :
-	cleaned up PKGBUILD in prep for new upload to AUR, setting fixed version.
-
-2014-03-16 Brent Saner <bts (at) phreewifi (dot) org>
-
-	* 20140316-1 :
-	enabled mod_lua thanks to Humberto Diógenes; "it has no external dependencies, is extremely lightweight and it's *the* recommended language for extending FS." https://wiki.freeswitch.org/wiki/Which_scripting_language_should_I_use%3F
-	added -f (--force) to the python binary to ease in testing pkgbuilding. hoping this doesn't bite me in the ass.
-	prepping/finalizing for replacing freeswitch-git as new maintainer in AUR, removing freeswitch-fixed
-
-2014-03-04 Brent Saner <bts (at) phreewifi (dot) org>
-
-	* 20140304-1 :
-	trying to clean up to proper -git pkg to replace outdated freeswitch-git
-
-2014-02-28 Brent Saner <bts (at) phreewifi (dot) org>
-
-	* 20140228-1 :
-	"forked" package to new AUR pkg
-	added systemd support
-	removed rc.d support
-	forced unixodbc support
-	forced python support (won't build without it now)
-	forced install of higher-fidelity sound
-	now fetches from git HEAD instead of specific checkout rev
-	cleaned up PKGBUILD regarding variables
-
-2010-11-15 TJ Vanderpoel <tj@rubyists.com>
-
-	* 20101126-8 :
-	Added /var/spool/freeswitch/storage
-
-2010-10-26 TJ Vanderpoel <tj@rubyists.com>
-
-	* 20101026-7 :
-	Changed handling of configuration so that it
-	  will not be overwritten on upgrades
-
-	* 20101026-5 :
-	Removed libtool files from lib dirs
-	Moved primary --prefix to /var/lib/freeswitch
-	More symlinks to get the mod/*.so files into
-	 /usr/lib/freeswitch where namcap wants them.
-
-	* 20101026-4 :
-	Got rid of empty vars in PKGBUILD
-
-	* 20101026-3 :
-	Moved ChangeLog to changelog= and out of the sources
-	 array.
-	Using $srcdir instead of $startdir for install commands
-
-	* 20101026-2 :
-	Added README and /usr/share/doc/freeswitch files
-
-	* 20101026-1 :
-	added ChangeLog.
-	Tidied up the /etc/rc.d/freeswitch script and added
-	 the 'fgstart' option to start under a supervisor such
-	 as runit or daemontools.
-
diff --git a/PKGBUILD b/PKGBUILD
index 747d0c65ecee..9231ff084a2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,7 +38,7 @@ _enabled_modules=(xml_int/mod_xml_curl
                   xml_int/mod_xml_cdr
                   formats/mod_shout
                   applications/mod_callcenter
-          languages/mod_lua)
+                  languages/mod_lua)
 
 # DISABLED MODULES
 # Remove from _disabled_modules if you want to build these
@@ -47,14 +47,16 @@ _enabled_modules=(xml_int/mod_xml_curl
 # languages/mod_lua - server-side lua
 # say/mod_say_ru - Russian phrases
 # dialplans/mod_dialplan_asterisk - Legacy dialplan
+# applications/mod_signalwire - https://freeswitch.org/confluence/display/FREESWITCH/mod_signalwire (requires libks which isn't even packaged)
 _disabled_modules=(languages/mod_spidermonkey
                    say/mod_say_ru
-                   dialplans/mod_dialplan_asterisk)
+                   dialplans/mod_dialplan_asterisk
+                   applications/mod_signalwire)
 # BUILD CONFIGURATION ENDS                     #
 
-pkgname='freeswitch'
-pkgver='1.6.17'
-pkgrel=2
+pkgname=freeswitch
+pkgver=1.8.5
+pkgrel=1
 pkgdesc="An opensource and free (libre, price) telephony system, similar to Asterisk."
 arch=('i686' 'x86_64')
 url="http://freeswitch.org/"
@@ -100,7 +102,7 @@ install=freeswitch.install
 backup=('etc/freeswitch/private/passwords.xml'
         'etc/freeswitch/vars.xml')
 #source=("git+https://stash.freeswitch.org/scm/fs/freeswitch.git#tag=v${pkgver}"
-source=("git+https://stash.freeswitch.org/scm/fs/freeswitch.git#tag=v${pkgver}"
+source=("git+https://freeswitch.org/stash/scm/fs/freeswitch.git/#tag=v${pkgver}"
         'freeswitch.conf.d'
          'README.freeswitch'
          'run.freeswitch'
@@ -115,7 +117,6 @@ source=("git+https://stash.freeswitch.org/scm/fs/freeswitch.git#tag=v${pkgver}"
          'conf_log.freeswitch.sig'
          'freeswitch.service.sig'
 	 'freeswitch-arch.patch.sig')  # required for 1.6.17
-changelog='ChangeLog'
 _pkgname="freeswitch"
 sha512sums=('SKIP'
             'a9c0f8397e9375b26f8c3950c07fff9ce2c60684bd99cfb371cd19cce2bfb2f042a5380a38751bcd212096611d38731a2613a93d037b53f0c1cf356180b98912'
@@ -170,7 +171,11 @@ prepare() {
 
   # CONFIGURE
   # We need to override some things for the ./configure for 1.6.17
-  PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig ./configure \
+  #./configure \
+  export CFLAGS="${CFLAGS} -Wno-error -D__alloca=alloca"
+  export CXXFLAGS="${CFLAGS}"
+  PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \
+  ./configure \
     --prefix=/var/lib/freeswitch \
     --with-python=/usr/bin/python2 \
     --bindir=/usr/bin \
@@ -191,13 +196,16 @@ prepare() {
     --with-certsdir=/etc/freeswitch/certs \
     --with-rundir=/run/freeswitch
 
-    patch -Np1 < ../freeswitch-arch.patch  # needed for 1.6.17
+    #patch -Np1 < ../freeswitch-arch.patch  # needed for 1.6.17
 }
 
 build() {
   cd ${srcdir}/${_pkgname}
 
   # COMPILE
+  # https://freeswitch.org/jira/browse/FS-11345
+  export CFLAGS="${CFLAGS} -Wno-error -D__alloca=alloca"
+  export CXXFLAGS="${CFLAGS}"
   make
 
 }
diff --git a/freeswitch.install b/freeswitch.install
index 72c30dc8ac11..c30c2e46df70 100644
--- a/freeswitch.install
+++ b/freeswitch.install
@@ -4,7 +4,7 @@ pre_install() {
     echo 'Adding group freeswitch'
     groupadd  -r freeswitch
   fi
-  id freeswitch > /dev/null
+  id freeswitch > /dev/null 2>&1
   if [ $? -ne 0 ];then
     echo 'Adding user freeswitch'
     useradd -d /usr/share/freeswitch -r -g freeswitch freeswitch
@@ -40,8 +40,8 @@ post_upgrade() {
 }
 
 post_remove() {
-  rm  -rf /etc/freeswitch
-  echo 'Not removing /usr/share/freeswitch/conf/ config directories!!  If you do not want to keep them, rm -rf them away'
+  #rm  -rf /etc/freeswitch
+  #echo 'Not removing /usr/share/freeswitch/conf/ config directories!!  If you do not want to keep them, rm -rf them away'
   userdel -rf freeswitch
   getent group freeswitch &> /dev/null && groupdel freeswitch
   true