summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD29
-rw-r--r--freeswitch-arch.patch25
-rw-r--r--freeswitch-arch.patch.sigbin0 -> 566 bytes
4 files changed, 52 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 880c9778898d..cd6bc951a34a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Oct 20 06:34:15 UTC 2016
+# Fri Jun 23 18:24:03 UTC 2017
pkgbase = freeswitch-git
pkgdesc = An opensource and free (libre, price) telephony system, similar to Asterisk (git version).
- pkgver = 1.7.0.r31430.9407f89
+ pkgver = 1.7.16.r32469.cda7343841
pkgrel = 1
url = http://freeswitch.org/
install = freeswitch.install
@@ -35,6 +35,7 @@ pkgbase = freeswitch-git
depends = postgresql-libs
depends = libshout
depends = lua
+ depends = openssl-1.0
depends = opus
depends = freetype2
provides = freeswitch
@@ -49,12 +50,14 @@ pkgbase = freeswitch-git
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
@@ -62,6 +65,8 @@ pkgbase = freeswitch-git
sha512sums = e0ad57847905d11540567512fb224587a96db086ecaefd949964bd7e5bf29e448497fb3d6df5d88dbedd69beb5ae4618bb0e8462cbbb9fad84947c6932fc0b46
sha512sums = a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976
sha512sums = 0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb
+ sha512sums = 30adb4a387c3579ed2080ea6bd3f84062d8767d97e7c2c2cab645e637f34f28667754a2252668c0e0ce176ed48cafe59627ed93a46027d83af38ce440c8e906c
+ sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d15f22b6c0eb..6f179c125908 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -53,7 +53,7 @@ _disabled_modules=(languages/mod_spidermonkey
# BUILD CONFIGURATION ENDS #
pkgname='freeswitch-git'
-pkgver=1.7.0.r31430.9407f89
+pkgver=1.7.16.r32469.cda7343841
pkgrel=1
pkgdesc="An opensource and free (libre, price) telephony system, similar to Asterisk (git version)."
arch=('i686' 'x86_64')
@@ -70,6 +70,7 @@ depends=('curl'
'postgresql-libs'
'libshout'
'lua'
+ 'openssl-1.0'
'opus'
'freetype2')
# per https://wiki.freeswitch.org/wiki/FreeSwitch_Dependencies, dependencies are downloaded and built *from upstream*, so thankfully the deps are pretty minimal.
@@ -100,17 +101,19 @@ backup=('etc/freeswitch/private/passwords.xml'
'etc/freeswitch/vars.xml')
source=("git+https://stash.freeswitch.org/scm/fs/freeswitch.git"
'freeswitch.conf.d'
- 'README.freeswitch'
- 'run.freeswitch'
- 'run_log.freeswitch'
- 'conf_log.freeswitch'
- 'freeswitch.service'
+ '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.service.sig'
+ 'freeswitch-arch.patch.sig') # required for 1.6.17
changelog='ChangeLog'
_pkgname="freeswitch"
sha512sums=('SKIP'
@@ -120,12 +123,14 @@ sha512sums=('SKIP'
'e0ad57847905d11540567512fb224587a96db086ecaefd949964bd7e5bf29e448497fb3d6df5d88dbedd69beb5ae4618bb0e8462cbbb9fad84947c6932fc0b46'
'a4fd539de109de3475abfeb2bd8a95670af3f5af83bd6f6b229df19e81da3f121c28a62cff282f9dc152908ebe0f24f76743e00c72fa04dc1fd465a00dc6f976'
'0d71a056de156f5840effabf6fb37a20e64ae011ecd48bf049886d4c073fe251cd6adeb0380784622b570948e1ca30ce7c92a2cade230a7177c97ed697e6f1cb'
+ '30adb4a387c3579ed2080ea6bd3f84062d8767d97e7c2c2cab645e637f34f28667754a2252668c0e0ce176ed48cafe59627ed93a46027d83af38ce440c8e906c'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP')
+ 'SKIP'
+ 'SKIP')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -171,7 +176,11 @@ build() {
sleep 5
# CONFIGURE
- ./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 \
--prefix=/var/lib/freeswitch \
--with-python=/usr/bin/python2 \
--bindir=/usr/bin \
@@ -192,6 +201,8 @@ build() {
--with-certsdir=/etc/freeswitch/certs \
--with-rundir=/run/freeswitch
+ patch -Np1 < ../freeswitch-arch.patch # needed for 1.6.17
+
# COMPILE
make
diff --git a/freeswitch-arch.patch b/freeswitch-arch.patch
new file mode 100644
index 000000000000..d839b9c1cd6c
--- /dev/null
+++ b/freeswitch-arch.patch
@@ -0,0 +1,25 @@
+# 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
new file mode 100644
index 000000000000..158ab81742f4
--- /dev/null
+++ b/freeswitch-arch.patch.sig
Binary files differ