main/freeswitch: upgrade to 1.4.7

also rework the system-lua patch so we dont need bootstrap as it takes
too much time.

Patch has been sent upstream:
https://jira.freeswitch.org/browse/FS-353

3 files changed, 57 insertions, 33 deletions

diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 1c9f89109..dc7a979bb 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
-pkgver=1.4.6
-pkgrel=1
+pkgver=1.4.7
+pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
@@ -45,6 +45,7 @@ source="http://files.freeswitch.org/$pkgname-$pkgver.tar.xz
 	0002-mod_lua-alpine-module-search-path.patch
 	freeswitch-mod_shout-textrels.patch
 	system-lua.patch
+	fix-postgres-headers.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -62,7 +63,6 @@ prepare() {
 		*.patch) msg $i; cd "$_builddir"; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	./rebootstrap.sh || return 1
 	cd "$srcdir"
 	update_config_sub || return 1
 }
@@ -191,7 +191,7 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-md5sums="0c5d130f990d61812503510e08c21e59  freeswitch-1.4.6.tar.xz
+md5sums="1b82747c0672200c6b8d1c6543c4804f  freeswitch-1.4.7.tar.xz
 4653b3b9c568bb9c782178abfaac128d  freeswitch-json-c-0.9.tar.gz
 f3a2d88b1059f6f4ff3c20a8169bc0f4  freeswitch-flite-1.5.4-current.tar.bz2
 8e9866ad6b570c6c95c8cba48060473f  freeswitch-lame-3.98.4.tar.gz
@@ -204,8 +204,9 @@ b48a5dbaa455bbe0bba4880cc06e6ff8  freeswitch.initd
 90b133b14a42c86d53d5e54dcbfbaf58  libshout-disable-examples.patch
 448ce737698753ec23283cb11725a62b  0002-mod_lua-alpine-module-search-path.patch
 4cd4923463c89bed053e6295b5a4ec40  freeswitch-mod_shout-textrels.patch
-70a2a4d6021988cf40f23a4ede3c464c  system-lua.patch"
-sha256sums="dcb489241dcbe54a80619565123545cc28bd44039684ce9dc5cb93108618732a  freeswitch-1.4.6.tar.xz
+78572b7d7c88942cc4dd24f80c0983c4  system-lua.patch
+f6067c7e7361b4b7a8583e8980c41f8a  fix-postgres-headers.patch"
+sha256sums="625b14dd930188e378cbebb88faaecc24fcc8c1aa907e73debeac277b2c752a9  freeswitch-1.4.7.tar.xz
 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f  freeswitch-json-c-0.9.tar.gz
 e98c54307954f406ef59a354f9ec274436b95be53f785e27191f19569af0ed7e  freeswitch-flite-1.5.4-current.tar.bz2
 ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8  freeswitch-lame-3.98.4.tar.gz
@@ -218,8 +219,9 @@ f83f9680d243eb254bf045571f971a6c5cf716367444cd48ed26d4c3367f4c41  modules.conf
 db0d3c252b5664ecb071bcf6868eff77c85dd7943a63fcfcac7e19db6a0ff61f  libshout-disable-examples.patch
 0f867ea9bc20766728968523da7aac21b1def34d3f825db26d89fbc93c11d2ca  0002-mod_lua-alpine-module-search-path.patch
 be1009327de615f04956ba0b0f44183f31c263e380af8027f94b976a84bcb09a  freeswitch-mod_shout-textrels.patch
-c0225fc7141da701b6233771c79b1ffb134d1c8e8318c8306c2d6045d7811ab5  system-lua.patch"
-sha512sums="466eab73fd006052ba40019cca8c03502475c059844b709b3bb179a5e020793fe5cd1ec41d48aa3c263c8297fc61367ccb65b2b6f8bb4f73d7d09f04e6e1da6d  freeswitch-1.4.6.tar.xz
+0f0b22b97fa56ee746c68094a83c1e5d01d1771bb3746ae333757937e877f60d  system-lua.patch
+4cc4d6e4cdca57eb2c5375dbc5941ec3a78fa7e86acda7b791bdf23d3e71250b  fix-postgres-headers.patch"
+sha512sums="99adae94b07bf5e4f4c5171967f862f508e61c6fff8d81cd3019f2c20e14c1024bd1d72a8adfd95d437e5cb96ea6c12a5b8bf2a416d78ceb113801fa7211d1e8  freeswitch-1.4.7.tar.xz
 38b8729275bbfebaee783e703d19481f3d32b50cfdeb338644b8db2742573ea025702c789b5ce8d5067dcde23c5a16b46231eaadf0b9c5dbff392d410912c772  freeswitch-json-c-0.9.tar.gz
 e239e5730d7cbbae8a2985445e49156ffc92489d9fac655d0a9db617ac63c2fc522e4c086a6afced26daa383c269c546ff7e62227ae8bdc998024a85991fb55d  freeswitch-flite-1.5.4-current.tar.bz2
 cf6cff914c06c2d65470c577eed2bfa226e9017cdfd26aa3e95c3b3b76c40568151ca223327859d6dacb982c80c06b672ba4e9f32ce1e452363c95126edb301b  freeswitch-lame-3.98.4.tar.gz
@@ -232,4 +234,5 @@ a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd3
 91a6d7c8456de65855930b371f568f0230c28422e667453aa48fababd185b47677c06ff0c79f94c2a02182439b012d48cb54548cbde3d12b8d0e1ffbb9b229cc  libshout-disable-examples.patch
 65c3d1fb08824fbdec3d9d3b332007a7847463bba272d9ba2df23ac218a2ede84eeb5a77a1a667c3dd370fe406bd2ebf8687d198a01519f4a09168418fbf39bc  0002-mod_lua-alpine-module-search-path.patch
 5f085254ca9f5dc196afd39fc55e083b1998e776d9de2428e5657d99077526c33c1fc13f12432598184ce63138447fed7c318c384b743681703f5682dc8e1e50  freeswitch-mod_shout-textrels.patch
-099e8e966e65fb480b00f20294c6c7ba02562f62af96482b72044f8efc79f45e42a82260099d8d1e5c1afdd4aa0946afa3fd6f323ab2781c899a5a18f082d7a7  system-lua.patch"
+dc2934f7d344879beee915f49a4f17d4b7af0d69f69393002de726848739fbed021e284ae7af3f347bd3b95549d745f0ee8a9d5c676378bf1988357415d3b5f6  system-lua.patch
+7f2f23efc69b7bc219d343421d62ff04076971b2d9130fb33f132b896a4da43aa5fcce2ece44e77f3a29cdade643fac63d96d59555daa0c1578d41592d5deedd  fix-postgres-headers.patch"
diff --git a/main/freeswitch/fix-postgres-headers.patch b/main/freeswitch/fix-postgres-headers.patch
new file mode 100644
index 000000000..c158c8d3b
--- /dev/null
+++ b/main/freeswitch/fix-postgres-headers.patch
@@ -0,0 +1,11 @@
+--- ./src/mod/event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c.orig
++++ ./src/mod/event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c
+@@ -37,7 +37,7 @@
+ 
+ #include <switch.h>
+ #include <sys/stat.h>
+-#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
+ 
+ SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_pg_csv_load);
+ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cdr_pg_csv_shutdown);
diff --git a/main/freeswitch/system-lua.patch b/main/freeswitch/system-lua.patch
index 5f1271170..b7588cf6d 100644
--- a/main/freeswitch/system-lua.patch
+++ b/main/freeswitch/system-lua.patch
@@ -1,33 +1,43 @@
---- ./src/mod/languages/mod_lua/Makefile.am.orig
-+++ ./src/mod/languages/mod_lua/Makefile.am
-@@ -3,15 +3,12 @@
- 
- MODNAME=mod_lua
- 
--LUA_DIR=$(switch_srcdir)/src/mod/languages/mod_lua/lua
--LIBLUA_A=$(LUA_DIR)/liblua.a
--
- AM_CFLAGS += $(CFLAGS) -D_GNU_SOURCE
+--- ./src/mod/languages/mod_lua/Makefile.in.orig
++++ ./src/mod/languages/mod_lua/Makefile.in
+@@ -91,22 +91,6 @@
+ am__dirstamp = $(am__leading_dot)dirstamp
+ am_mod_lua_la_OBJECTS = mod_lua_la-mod_lua.lo \
+ 	mod_lua_la-freeswitch_lua.lo mod_lua_la-mod_lua_wrap.lo \
+-	lua/mod_lua_la-lapi.lo lua/mod_lua_la-lcode.lo \
+-	lua/mod_lua_la-lctype.lo lua/mod_lua_la-ldebug.lo \
+-	lua/mod_lua_la-ldo.lo lua/mod_lua_la-ldump.lo \
+-	lua/mod_lua_la-lfunc.lo lua/mod_lua_la-lgc.lo \
+-	lua/mod_lua_la-llex.lo lua/mod_lua_la-lmem.lo \
+-	lua/mod_lua_la-lobject.lo lua/mod_lua_la-lopcodes.lo \
+-	lua/mod_lua_la-lparser.lo lua/mod_lua_la-lstate.lo \
+-	lua/mod_lua_la-lstring.lo lua/mod_lua_la-ltable.lo \
+-	lua/mod_lua_la-ltm.lo lua/mod_lua_la-lundump.lo \
+-	lua/mod_lua_la-lvm.lo lua/mod_lua_la-lzio.lo \
+-	lua/mod_lua_la-lauxlib.lo lua/mod_lua_la-lbaselib.lo \
+-	lua/mod_lua_la-lbitlib.lo lua/mod_lua_la-lcorolib.lo \
+-	lua/mod_lua_la-ldblib.lo lua/mod_lua_la-liolib.lo \
+-	lua/mod_lua_la-lmathlib.lo lua/mod_lua_la-loslib.lo \
+-	lua/mod_lua_la-lstrlib.lo lua/mod_lua_la-ltablib.lo \
+-	lua/mod_lua_la-loadlib.lo lua/mod_lua_la-linit.lo
+ mod_lua_la_OBJECTS = $(am_mod_lua_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -420,11 +404,13 @@
+ MODNAME = mod_lua
+ LUA_DIR = $(switch_srcdir)/src/mod/languages/mod_lua/lua
+ LIBLUA_A = $(LUA_DIR)/liblua.a
++LUA_CFLAGS := $(shell pkg-config --cflags lua5.2)
++LUA_LIBS := $(shell pkg-config --libs lua5.2)
  mod_LTLIBRARIES = mod_lua.la
 -mod_lua_la_SOURCES = mod_lua.cpp freeswitch_lua.cpp mod_lua_wrap.cpp lua/lapi.c lua/lcode.c lua/lctype.c lua/ldebug.c lua/ldo.c lua/ldump.c lua/lfunc.c lua/lgc.c lua/llex.c lua/lmem.c lua/lobject.c lua/lopcodes.c lua/lparser.c lua/lstate.c lua/lstring.c lua/ltable.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c lua/lauxlib.c lua/lbaselib.c lua/lbitlib.c lua/lcorolib.c lua/ldblib.c lua/liolib.c lua/lmathlib.c lua/loslib.c lua/lstrlib.c lua/ltablib.c lua/loadlib.c lua/linit.c
 -mod_lua_la_CXXFLAGS = -I$(LUA_DIR) $(AM_CPPFLAGS) -DLUA_USE_LINUX
 -mod_lua_la_CFLAGS = -I$(LUA_DIR) $(AM_CPPFLAGS) -DLUA_USE_LINUX
 -mod_lua_la_LIBADD = $(switch_builddir)/libfreeswitch.la 
 +mod_lua_la_SOURCES = mod_lua.cpp freeswitch_lua.cpp mod_lua_wrap.cpp
-+mod_lua_la_CXXFLAGS = $(LUA_CFLAGS) $(AM_CPPFLAGS) -DLUA_USE_LINUX
-+mod_lua_la_CFLAGS = $(LUA_CFLAGS) $(AM_CPPFLAGS) -DLUA_USE_LINUX
++mod_lua_la_CXXFLAGS = $(AM_CPPFLAGS) $(LUA_CFLAGS)
++mod_lua_la_CFLAGS = $(AM_CPPFLAGS) $(LUA_CFLAGS)
 +mod_lua_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LUA_LIBS)
  mod_lua_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm $(AM_LDFLAGS) $(SOLINK) #$(LIBLUA_A)
- 
- #BUILT_SOURCES = $(LIBLUA_A)
---- ./configure.ac.orig
-+++ ./configure.ac
-@@ -1376,6 +1376,8 @@
- 
- CHECK_ERLANG
- 
-+PKG_CHECK_MODULES(LUA, lua5.2, [have_lua=yes], [have_lua=no])
-+
- # we never use this, and hard setting it will make cross compile work better
- ac_cv_file_dbd_apr_dbd_mysql_c=no
+ all: all-am