fixed for gcc 8

6 files changed, 24 insertions, 119 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd6bc951a34a..732392973493 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 # Generated by mksrcinfo v8
-# Fri Jun 23 18:24:03 UTC 2017
+# Sun Apr 14 16:57:56 UTC 2019
 pkgbase = freeswitch-git
 	pkgdesc = An opensource and free (libre, price) telephony system, similar to Asterisk (git version).
-	pkgver = 1.7.16.r32469.cda7343841
+	pkgver = 1.7.0.r33467.a5858c8b9f
 	pkgrel = 1
 	url = http://freeswitch.org/
 	install = freeswitch.install
-	changelog = ChangeLog
 	arch = i686
 	arch = x86_64
 	license = MPL
@@ -43,21 +42,19 @@ pkgbase = freeswitch-git
 	conflicts = freeswitch-fixed
 	backup = etc/freeswitch/private/passwords.xml
 	backup = etc/freeswitch/vars.xml
-	source = git+https://stash.freeswitch.org/scm/fs/freeswitch.git
+	source = git+https://freeswitch.org/stash/scm/fs/freeswitch.git/
 	source = freeswitch.conf.d
 	source = README.freeswitch
 	source = run.freeswitch
 	source = run_log.freeswitch
 	source = conf_log.freeswitch
 	source = freeswitch.service
-	source = freeswitch-arch.patch
 	source = freeswitch.conf.d.sig
 	source = README.freeswitch.sig
 	source = run.freeswitch.sig
 	source = run_log.freeswitch.sig
 	source = conf_log.freeswitch.sig
 	source = freeswitch.service.sig
-	source = freeswitch-arch.patch.sig
 	sha512sums = SKIP
 	sha512sums = a9c0f8397e9375b26f8c3950c07fff9ce2c60684bd99cfb371cd19cce2bfb2f042a5380a38751bcd212096611d38731a2613a93d037b53f0c1cf356180b98912
 	sha512sums = 55e913bae6d3bb04ae9253989e40b6e0c3bfcecf95c28c904f5022ed218227c68530aaa60f99d7486469c95f9c1719da041a8fef82bf4ee54b1f901c443d347d
@@ -65,8 +62,6 @@ pkgbase = freeswitch-git
 	sha512sums = e0ad57847905d11540567512fb224587a96db086ecaefd949964bd7e5bf29e448497fb3d6df5d88dbedd69beb5ae4618bb0e8462cbbb9fad84947c6932fc0b46
 	sha512sums = a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976
 	sha512sums = 0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb
-	sha512sums = 30adb4a387c3579ed2080ea6bd3f84062d8767d97e7c2c2cab645e637f34f28667754a2252668c0e0ce176ed48cafe59627ed93a46027d83af38ce440c8e906c
-	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
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 6f179c125908..8811b875e507 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,13 +47,15 @@ _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-git'
-pkgver=1.7.16.r32469.cda7343841
+pkgver=1.7.0.r33467.a5858c8b9f
 pkgrel=1
 pkgdesc="An opensource and free (libre, price) telephony system, similar to Asterisk (git version)."
 arch=('i686' 'x86_64')
@@ -99,22 +101,19 @@ conflicts=('freeswitch'
 install=freeswitch.install
 backup=('etc/freeswitch/private/passwords.xml'
         'etc/freeswitch/vars.xml')
-source=("git+https://stash.freeswitch.org/scm/fs/freeswitch.git"
+source=("git+https://freeswitch.org/stash/scm/fs/freeswitch.git/"
         'freeswitch.conf.d'
         'README.freeswitch'
         'run.freeswitch'
         'run_log.freeswitch'
         'conf_log.freeswitch'
         'freeswitch.service'
-	'freeswitch-arch.patch'  # required for 1.6.17
 	'freeswitch.conf.d.sig'
 	'README.freeswitch.sig'
 	'run.freeswitch.sig'
 	'run_log.freeswitch.sig'
 	'conf_log.freeswitch.sig'
-	'freeswitch.service.sig'
-	'freeswitch-arch.patch.sig')  # required for 1.6.17
-changelog='ChangeLog'
+	'freeswitch.service.sig')
 _pkgname="freeswitch"
 sha512sums=('SKIP'
             'a9c0f8397e9375b26f8c3950c07fff9ce2c60684bd99cfb371cd19cce2bfb2f042a5380a38751bcd212096611d38731a2613a93d037b53f0c1cf356180b98912'
@@ -123,8 +122,6 @@ sha512sums=('SKIP'
             'e0ad57847905d11540567512fb224587a96db086ecaefd949964bd7e5bf29e448497fb3d6df5d88dbedd69beb5ae4618bb0e8462cbbb9fad84947c6932fc0b46'
             'a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976'
             '0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb'
-	    '30adb4a387c3579ed2080ea6bd3f84062d8767d97e7c2c2cab645e637f34f28667754a2252668c0e0ce176ed48cafe59627ed93a46027d83af38ce440c8e906c'
-            'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -178,9 +175,15 @@ build() {
   # CONFIGURE
   #./configure \
   # We need to override some things for the ./configure for 1.6.17
+  #PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \
+  #CFLAGS+=" -I/usr/include/openssl-1.0" \
+  #LDFLAGS+=" -I/usr/lib/openssl-1.0" ./configure \
+  sed -i -re 's@^(confdir=)"$prefix/conf"@"/etc/freeswitch"@g' ./configure
+  export CFLAGS="${CFLAGS} -Wno-error -D__alloca=alloca"
+  export CXXFLAGS="${CFLAGS}"
+  #./configure \
   PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \
-  CFLAGS+=" -I/usr/include/openssl-1.0" \
-  LDFLAGS+=" -I/usr/lib/openssl-1.0" ./configure \
+  ./configure \
     --prefix=/var/lib/freeswitch \
     --with-python=/usr/bin/python2 \
     --bindir=/usr/bin \
@@ -201,8 +204,6 @@ build() {
     --with-certsdir=/etc/freeswitch/certs \
     --with-rundir=/run/freeswitch
 
-    patch -Np1 < ../freeswitch-arch.patch  # needed for 1.6.17
-
   # COMPILE
   make
 
@@ -263,8 +264,8 @@ package() {
   echo "<X-PRE-PROCESS cmd=\"set\" data=\"default_password=$(tr -dc 0-9 < /dev/urandom | head -c10)\"/>" > etc/freeswitch/private/passwords.xml
   chmod 700 etc/freeswitch/private
   chmod 600 etc/freeswitch/private/passwords.xml
-  ln -sf /etc/freeswitch var/lib/freeswitch/conf
-  cp -a etc/freeswitch/* usr/share/doc/freeswitch/examples/conf.default/
+  #ln -sf /etc/freeswitch var/lib/freeswitch/conf
+  #cp -a etc/freeswitch/* usr/share/doc/freeswitch/examples/conf.default/
   install -d -m 0755 etc/freeswitch/certs
 
   for _mod in ${_enabled_modules[@]};do
@@ -275,8 +276,8 @@ package() {
     disable_mod_xml $_mod
   done
 
-  mv etc/freeswitch/* usr/share/doc/freeswitch/examples/conf.archlinux/
-  rmdir etc/freeswitch
+  #mv etc/freeswitch/* usr/share/doc/freeswitch/examples/conf.archlinux/
+  #rmdir etc/freeswitch
   install -D -m 0755 -d usr/share/freeswitch/conf
   install -D -m 0755 "${srcdir}/run.freeswitch" usr/share/freeswitch/run
   install -D -m 0755 "${srcdir}/run_log.freeswitch" usr/share/freeswitch/log/run
diff --git a/freeswitch-arch.patch b/freeswitch-arch.patch
deleted file mode 100644
index d839b9c1cd6c..000000000000
--- a/freeswitch-arch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Thanks, mal! [https://aur.archlinux.org/account/mal]
-diff -ura freeswitch-orig/src/switch_ivr_play_say.c freeswitch/src/switch_ivr_play_say.c
---- freeswitch-orig/src/switch_ivr_play_say.c	2017-06-16 02:59:16.014037406 -0400
-+++ freeswitch/src/switch_ivr_play_say.c	2017-06-16 03:05:49.060484516 -0400
-@@ -1665,7 +1665,7 @@
- 				}
- 			}
- 
--			buflen = FILE_STARTSAMPLES * sizeof(*abuf) * fh->cur_channels ? fh->cur_channels : fh->channels;
-+			buflen = FILE_STARTSAMPLES * sizeof(*abuf) * (fh->cur_channels ? fh->cur_channels : fh->channels);
- 
- 			if (buflen > write_frame.buflen) {
- 				abuf = realloc(abuf, buflen);
-diff -ura freeswitch-orig/libs/esl/fs_cli.c freeswitch/libs/esl/fs_cli.c
---- freeswitch-orig/libs/esl/fs_cli.c	2017-06-21 12:52:54.490320046 -0400
-+++ freeswitch/libs/esl/fs_cli.c	2017-06-21 12:49:53.456699573 -0400
-@@ -76,7 +76,7 @@
- static int warn_stop = 0;
- static int connected = 0;
- static int allow_ctl_c = 0;
--static char bare_prompt_str[512] = "";
-+static char bare_prompt_str[514] = "";
- static int bare_prompt_str_len = 0;
- static char prompt_str[512] = "";
- static char prompt_color[12] = {ESL_SEQ_DEFAULT_COLOR};
diff --git a/freeswitch-arch.patch.sig b/freeswitch-arch.patch.sig
deleted file mode 100644
index 158ab81742f4..000000000000
--- a/freeswitch-arch.patch.sig
+++ /dev/null
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